operator-sdk update from v0.17.1 to v0.18.0 (#56)

* operator-sdk update from v0.17.1 to v0.18.0

* Update compatibility info in README.md

Author: Tomas

README.md

@@ -142,8 +142,9 @@ can be found [here](https://github.com/kubernetes/client-go/blob/master/README.m
 
 Postgres operator compatibility with Operator SDK version is in the table below
 
-|                               | Operator SDK 0.17.x | Operator SDK 1.9.0 |
-|-------------------------------|---------------------|--------------------|
-| `postgres-operator 0.4.x`     | ✓                   | -                  |
-| `postgres-operator 1.0.x`     | -                   | ✓                  |
-| `HEAD`                        | ✓                   | -                  |
+|                               | Operator SDK version | apiextensions.k8s.io |
+|-------------------------------|----------------------|----------------------|
+| `postgres-operator 0.4.x`     | v0.17                |  v1beta1             |
+| `postgres-operator 1.0.x`     | v0.18                |  v1                  |
+| `HEAD`                        | v0.18                |  v1                  |
+

deploy/crds/db.movetokube.com_postgres_crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: postgres.db.movetokube.com
@@ -10,78 +10,81 @@ spec:
     plural: postgres
     singular: postgres
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: Postgres is the Schema for the postgres API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: PostgresSpec defines the desired state of Postgres
-          properties:
-            database:
-              type: string
-            dropOnDelete:
-              type: boolean
-            extensions:
-              items:
-                type: string
-              type: array
-            masterRole:
-              type: string
-            schemas:
-              items:
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Postgres is the Schema for the postgres API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PostgresSpec defines the desired state of Postgres
+            properties:
+              database:
                 type: string
-              type: array
-          required:
-          - database
-          type: object
-        status:
-          description: PostgresStatus defines the observed state of Postgres
-          properties:
-            extensions:
-              items:
+              dropOnDelete:
+                type: boolean
+              extensions:
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              masterRole:
                 type: string
-              type: array
-            roles:
-              description: PostgresRoles stores the different group roles for database
-              properties:
-                owner:
+              schemas:
+                items:
                   type: string
-                reader:
+                type: array
+                x-kubernetes-list-type: set
+            required:
+            - database
+            type: object
+          status:
+            description: PostgresStatus defines the observed state of Postgres
+            properties:
+              extensions:
+                items:
                   type: string
-                writer:
+                type: array
+                x-kubernetes-list-type: set
+              roles:
+                description: PostgresRoles stores the different group roles for database
+                properties:
+                  owner:
+                    type: string
+                  reader:
+                    type: string
+                  writer:
+                    type: string
+                required:
+                - owner
+                - reader
+                - writer
+                type: object
+              schemas:
+                items:
                   type: string
-              required:
-              - owner
-              - reader
-              - writer
-              type: object
-            schemas:
-              items:
-                type: string
-              type: array
-            succeeded:
-              type: boolean
-          required:
-          - roles
-          - succeeded
-          type: object
-      type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
+                type: array
+                x-kubernetes-list-type: set
+              succeeded:
+                type: boolean
+            required:
+            - roles
+            - succeeded
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}

deploy/crds/db.movetokube.com_postgresusers_crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: postgresusers.db.movetokube.com
@@ -10,63 +10,62 @@ spec:
     plural: postgresusers
     singular: postgresuser
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: PostgresUser is the Schema for the postgresusers API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: PostgresUserSpec defines the desired state of PostgresUser
-          properties:
-            database:
-              type: string
-            privileges:
-              type: string
-            role:
-              type: string
-            secretName:
-              type: string
-          required:
-          - database
-          - role
-          - secretName
-          type: object
-        status:
-          description: PostgresUserStatus defines the observed state of PostgresUser
-          properties:
-            databaseName:
-              type: string
-            postgresGroup:
-              type: string
-            postgresLogin:
-              type: string
-            postgresRole:
-              type: string
-            succeeded:
-              type: boolean
-          required:
-          - databaseName
-          - postgresGroup
-          - postgresLogin
-          - postgresRole
-          - succeeded
-          type: object
-      type: object
-  version: v1alpha1
   versions:
   - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: PostgresUser is the Schema for the postgresusers API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PostgresUserSpec defines the desired state of PostgresUser
+            properties:
+              database:
+                type: string
+              privileges:
+                type: string
+              role:
+                type: string
+              secretName:
+                type: string
+            required:
+            - database
+            - role
+            - secretName
+            type: object
+          status:
+            description: PostgresUserStatus defines the observed state of PostgresUser
+            properties:
+              databaseName:
+                type: string
+              postgresGroup:
+                type: string
+              postgresLogin:
+                type: string
+              postgresRole:
+                type: string
+              succeeded:
+                type: boolean
+            required:
+            - databaseName
+            - postgresGroup
+            - postgresLogin
+            - postgresRole
+            - succeeded
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}

go.mod

@@ -7,21 +7,20 @@ require (
 	github.com/go-logr/logr v0.1.0
 	github.com/go-openapi/spec v0.19.4
 	github.com/golang/mock v1.3.1
-	github.com/imdario/mergo v0.3.8 // indirect
-	github.com/lib/pq v1.2.0
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.8.1
-	github.com/operator-framework/operator-sdk v0.17.1
+	github.com/lib/pq v1.3.0
+	github.com/onsi/ginkgo v1.12.0
+	github.com/onsi/gomega v1.9.0
+	github.com/operator-framework/operator-sdk v0.18.0
 	github.com/spf13/pflag v1.0.5
-	k8s.io/api v0.17.4
-	k8s.io/apimachinery v0.17.4
+	k8s.io/api v0.18.2
+	k8s.io/apimachinery v0.18.2
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
+	k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
 	//k8s.io/kubernetes v1.16.2 // indirect
-	sigs.k8s.io/controller-runtime v0.5.2
+	sigs.k8s.io/controller-runtime v0.6.0
 )
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
-	k8s.io/client-go => k8s.io/client-go v0.17.4 // Required by prometheus-operator
+	k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
 )