feat: upgrade go sample to use 0.18.1 SDK version (#131)

camilamacedo86 · web-flow · commit 1306fcccf2a2 · 2020-07-03T12:18:33.000+01:00
diff --git a/go/memcached-operator/deploy/crds/cache.example.com_memcacheds_crd.yaml b/go/memcached-operator/deploy/crds/cache.example.com_memcacheds_crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: memcacheds.cache.example.com
@@ -10,49 +10,48 @@ spec:
     plural: memcacheds
     singular: memcached
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: Memcached is the Schema for the memcacheds 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: MemcachedSpec defines the desired state of Memcached
-          properties:
-            size:
-              description: Size is the size of the memcached deployment
-              format: int32
-              type: integer
-          required:
-          - size
-          type: object
-        status:
-          description: MemcachedStatus defines the observed state of Memcached
-          properties:
-            nodes:
-              description: Nodes are the names of the memcached pods
-              items:
-                type: string
-              type: array
-              x-kubernetes-list-type: set
-          required:
-          - nodes
-          type: object
-      type: object
-  version: v1alpha1
   versions:
   - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Memcached is the Schema for the memcacheds 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: MemcachedSpec defines the desired state of Memcached
+            properties:
+              size:
+                description: Size is the size of the memcached deployment
+                format: int32
+                type: integer
+            required:
+            - size
+            type: object
+          status:
+            description: MemcachedStatus defines the observed state of Memcached
+            properties:
+              nodes:
+                description: Nodes are the names of the memcached pods
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+            required:
+            - nodes
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
diff --git a/go/memcached-operator/deploy/olm-catalog/memcached-operator/manifests/cache.example.com_memcacheds_crd.yaml b/go/memcached-operator/deploy/olm-catalog/memcached-operator/manifests/cache.example.com_memcacheds_crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: memcacheds.cache.example.com
@@ -10,49 +10,48 @@ spec:
     plural: memcacheds
     singular: memcached
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: Memcached is the Schema for the memcacheds 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: MemcachedSpec defines the desired state of Memcached
-          properties:
-            size:
-              description: Size is the size of the memcached deployment
-              format: int32
-              type: integer
-          required:
-          - size
-          type: object
-        status:
-          description: MemcachedStatus defines the observed state of Memcached
-          properties:
-            nodes:
-              description: Nodes are the names of the memcached pods
-              items:
-                type: string
-              type: array
-              x-kubernetes-list-type: set
-          required:
-          - nodes
-          type: object
-      type: object
-  version: v1alpha1
   versions:
   - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: Memcached is the Schema for the memcacheds 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: MemcachedSpec defines the desired state of Memcached
+            properties:
+              size:
+                description: Size is the size of the memcached deployment
+                format: int32
+                type: integer
+            required:
+            - size
+            type: object
+          status:
+            description: MemcachedStatus defines the observed state of Memcached
+            properties:
+              nodes:
+                description: Nodes are the names of the memcached pods
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+            required:
+            - nodes
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
diff --git a/go/memcached-operator/deploy/olm-catalog/memcached-operator/manifests/memcached-operator.clusterserviceversion.yaml b/go/memcached-operator/deploy/olm-catalog/memcached-operator/manifests/memcached-operator.clusterserviceversion.yaml
@@ -16,7 +16,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-  name: memcached-operator.v0.17.0
+  name: memcached-operator.v0.18.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -162,4 +162,4 @@ spec:
   provider:
     name: Example
     url: www.example.com
-  version: 0.17.0
+  version: 0.18.1
diff --git a/go/memcached-operator/go.mod b/go/memcached-operator/go.mod
@@ -3,15 +3,15 @@ module github.com/operator-framework/operator-sdk-samples/go/memcached-operator
 go 1.13
 
 require (
-	github.com/operator-framework/operator-sdk v0.17.0
+	github.com/operator-framework/operator-sdk v0.18.1
 	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
-	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
 )
diff --git a/go/memcached-operator/go.sum b/go/memcached-operator/go.sum
diff --git a/go/memcached-operator/tools.go b/go/memcached-operator/tools.go

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ metadata:`
`16`	`16`	`}`
`17`	`17`	`]`
`18`	`18`	`capabilities: Basic Install`
`19`		`- name: memcached-operator.v0.17.0`
	`19`	`+ name: memcached-operator.v0.18.1`
`20`	`20`	`namespace: placeholder`
`21`	`21`	`spec:`
`22`	`22`	`apiservicedefinitions: {}`
`@@ -162,4 +162,4 @@ spec:`
`162`	`162`	`provider:`
`163`	`163`	`name: Example`
`164`	`164`	`url: www.example.com`
`165`		`- version: 0.17.0`
	`165`	`+ version: 0.18.1`