Merge pull request #90 from camilamacedo86/up-0.12

camilamacedo86 · web-flow · commit 36f2a5d3d72e · 2019-12-02T18:06:59.000Z
Go sample upgrade to use SDK 0.12
diff --git a/memcached-operator/README.md b/memcached-operator/README.md
@@ -58,11 +58,42 @@ $ sed -i "" 's|REPLACE_IMAGE|quay.io/example-inc/memcached-operator|g' deploy/op
 
 Run `make install` to install the operator. Check that the operator is running in the cluster, also check that the example Memcached service was deployed.
 
+Following the expected result.
+
+```shell
+$ kubectl get all -n memcached 
+NAME                                      READY   STATUS    RESTARTS   AGE
+pod/example-memcached-7c4df9b7b4-lzd6j    1/1     Running   0          64s
+pod/example-memcached-7c4df9b7b4-wbtkz    1/1     Running   0          64s
+pod/example-memcached-7c4df9b7b4-wt6jb    1/1     Running   0          64s
+pod/memcached-operator-56f54d84bf-zrtfv   1/1     Running   0          69s
+
+NAME                                 TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)             AGE
+service/example-memcached            ClusterIP   10.108.124.47   <none>        11211/TCP           63s
+service/memcached-operator-metrics   ClusterIP   10.108.67.82    <none>        8383/TCP,8686/TCP   66s
+
+NAME                                 READY   UP-TO-DATE   AVAILABLE   AGE
+deployment.apps/example-memcached    3/3     3            3           65s
+deployment.apps/memcached-operator   1/1     1            1           70s
+
+NAME                                            DESIRED   CURRENT   READY   AGE
+replicaset.apps/example-memcached-7c4df9b7b4    3         3         3       65s
+replicaset.apps/memcached-operator-56f54d84bf   1         1         1       70s
+```
+
 ### Uninstalling
 
 To uninstall all that was performed in the above step run `make uninstall`.
 
-### Run Tests
+### Troubleshooting
+
+Use the following command to check the operator logs.
+
+```shell
+kubectl logs deployment.apps/memcached-operator -n memcached
+```
+
+### Running Tests
 
 Run `make test-e2e` to run the integration e2e tests with different options. For
 more information see the [writing e2e tests](https://github.com/operator-framework/operator-sdk/blob/master/doc/test-framework/writing-e2e-tests.md) guide.
diff --git a/memcached-operator/cmd/manager/main.go b/memcached-operator/cmd/manager/main.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/operator-framework/operator-sdk-samples/memcached-operator/pkg/apis"
 	"github.com/operator-framework/operator-sdk-samples/memcached-operator/pkg/controller"
+	"github.com/operator-framework/operator-sdk-samples/memcached-operator/version"
 
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics"
@@ -39,6 +40,7 @@ var (
 var log = logf.Log.WithName("cmd")
 
 func printVersion() {
+	log.Info(fmt.Sprintf("Operator Version: %s", version.Version))
 	log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
 	log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
 	log.Info(fmt.Sprintf("Version of operator-sdk: %v", sdkVersion.Version))
diff --git a/memcached-operator/deploy/crds/cache.example.com_memcacheds_crd.yaml b/memcached-operator/deploy/crds/cache.example.com_memcacheds_crd.yaml
@@ -46,7 +46,6 @@ spec:
               items:
                 type: string
               type: array
-              uniqueItems: true
           required:
           - nodes
           type: object
diff --git a/memcached-operator/deploy/olm-catalog/memcached-operator/0.12.0/memcached-operator.v0.12.0.clusterserviceversion.yaml b/memcached-operator/deploy/olm-catalog/memcached-operator/0.12.0/memcached-operator.v0.12.0.clusterserviceversion.yaml
@@ -0,0 +1,175 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: |-
+      [
+        {
+          "apiVersion": "cache.example.com/v1alpha1",
+          "kind": "Memcached",
+          "metadata": {
+            "name": "example-memcached"
+          },
+          "spec": {
+            "size": 3
+          }
+        }
+      ]
+    capabilities: Basic Install
+  name: memcached-operator.v0.12.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions:
+    owned:
+      - description: Represents a cluster of Memcached apps
+        displayName: Memcached App
+        kind: Memcached
+        name: memcacheds.cache.example.com
+        resources:
+          - kind: Deployment
+            name: ""
+            version: v1
+          - kind: Service
+            name: ""
+            version: v1
+          - kind: ReplicaSet
+            name: ""
+            version: v1
+          - kind: Pod
+            name: ""
+            version: v1
+        specDescriptors:
+          - description: The desired number of member Pods for the deployment.
+            displayName: Size
+            path: size
+            x-descriptors:
+              - urn:alm:descriptor:com.tectonic.ui:podCount
+        statusDescriptors:
+          - description: The current status of the application.
+            displayName: Status
+            path: phase
+            x-descriptors:
+              - urn:alm:descriptor:io.kubernetes.phase
+          - description: Explanation for the current status of the application.
+            displayName: Status Details
+            path: reason
+            x-descriptors:
+              - urn:alm:descriptor:io.kubernetes.phase:reason
+        version: v1alpha1
+  description: Main enterprise application providing business critical features with
+    high availability and no manual intervention.
+  displayName: Memcached Application
+  install:
+    spec:
+      deployments:
+        - name: memcached-operator
+          spec:
+            replicas: 1
+            selector:
+              matchLabels:
+                name: memcached-operator
+            strategy: {}
+            template:
+              metadata:
+                labels:
+                  name: memcached-operator
+              spec:
+                containers:
+                  - command:
+                      - memcached-operator
+                    env:
+                      - name: WATCH_NAMESPACE
+                        valueFrom:
+                          fieldRef:
+                            fieldPath: metadata.annotations['olm.targetNamespaces']
+                      - name: POD_NAME
+                        valueFrom:
+                          fieldRef:
+                            fieldPath: metadata.name
+                      - name: OPERATOR_NAME
+                        value: memcached-operator
+                    image: REPLACE_IMAGE
+                    imagePullPolicy: Always
+                    name: memcached-operator
+                    resources: {}
+                serviceAccountName: memcached-operator
+      permissions:
+        - rules:
+            - apiGroups:
+                - ""
+              resources:
+                - pods
+                - services
+                - services/finalizers
+                - endpoints
+                - persistentvolumeclaims
+                - events
+                - configmaps
+                - secrets
+              verbs:
+                - '*'
+            - apiGroups:
+                - apps
+              resources:
+                - deployments
+                - daemonsets
+                - replicasets
+                - statefulsets
+              verbs:
+                - '*'
+            - apiGroups:
+                - monitoring.coreos.com
+              resources:
+                - servicemonitors
+              verbs:
+                - get
+                - create
+            - apiGroups:
+                - apps
+              resourceNames:
+                - memcached-operator
+              resources:
+                - deployments/finalizers
+              verbs:
+                - update
+            - apiGroups:
+                - ""
+              resources:
+                - pods
+              verbs:
+                - get
+            - apiGroups:
+                - apps
+              resources:
+                - replicasets
+              verbs:
+                - get
+            - apiGroups:
+                - cache.example.com
+              resources:
+                - '*'
+              verbs:
+                - '*'
+          serviceAccountName: memcached-operator
+    strategy: deployment
+  installModes:
+    - supported: true
+      type: OwnNamespace
+    - supported: true
+      type: SingleNamespace
+    - supported: false
+      type: MultiNamespace
+    - supported: true
+      type: AllNamespaces
+  keywords:
+    - memcached
+    - app
+  maintainers:
+    - email: corp@example.com
+      name: Some Corp
+  maturity: alpha
+  provider:
+    name: Example
+    url: www.example.com
+  version: 0.12.0
diff --git a/memcached-operator/deploy/olm-catalog/memcached-operator/memcached-operator.package.yaml b/memcached-operator/deploy/olm-catalog/memcached-operator/memcached-operator.package.yaml
@@ -1,5 +1,5 @@
 channels:
-- currentCSV: memcached-operator.v0.11.0
+- currentCSV: memcached-operator.v0.12.0
   name: alpha
 defaultChannel: alpha
 packageName: memcached-operator
diff --git a/memcached-operator/go.mod b/memcached-operator/go.mod
@@ -1,32 +1,38 @@
 module github.com/operator-framework/operator-sdk-samples/memcached-operator
 
+go 1.13
+
 require (
 	github.com/go-openapi/spec v0.19.0
-	github.com/operator-framework/operator-sdk v0.10.1-0.20190906161029-1cb0481ca946
+	github.com/operator-framework/operator-sdk v0.12.1-0.20191112211508-82fc57de5e5b
 	github.com/spf13/pflag v1.0.3
-	k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
-	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
-	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208
-	sigs.k8s.io/controller-runtime v0.2.2
-)
-
-// Pinned to kubernetes-1.14.1
-replace (
-	k8s.io/api => k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
-	k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190409023720-1bc0c81fa51d
+	k8s.io/api v0.0.0
+	k8s.io/apimachinery v0.0.0
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
+	sigs.k8s.io/controller-runtime v0.3.0
 )
 
+// Pinned to kubernetes-1.15.4
 replace (
-	github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
-	// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
-	// resolve it correctly.
-	github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.0.0-20190525122359-d20e84d0fb64
+	k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
+	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
+	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
 )
-
-replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.11.0
-
-go 1.12
diff --git a/memcached-operator/go.sum b/memcached-operator/go.sum
diff --git a/memcached-operator/pkg/apis/cache/v1alpha1/memcached_types.go b/memcached-operator/pkg/apis/cache/v1alpha1/memcached_types.go
diff --git a/memcached-operator/pkg/apis/cache/v1alpha1/zz_generated.deepcopy.go b/memcached-operator/pkg/apis/cache/v1alpha1/zz_generated.deepcopy.go
