Update Makefile and Default Channel to v4.2 (#365)

Signed-off-by: Daniel Fan <[email protected]>

Author: Daniel-Fan

Makefile

@@ -19,7 +19,7 @@ KUBECTL ?= $(shell which kubectl)
 OPERATOR_SDK ?= $(shell which operator-sdk)
 CONTROLLER_GEN ?= $(shell which controller-gen)
 KUSTOMIZE ?= $(shell which kustomize)
-YQ_VERSION=3.4.0
+YQ_VERSION=v4.27.3
 KUSTOMIZE_VERSION=v3.8.7
 OPERATOR_SDK_VERSION=v1.32.0
 OPENSHIFT_VERSIONS ?= v4.12-v4.17
@@ -80,7 +80,7 @@ BUNDLE_IMAGE_NAME ?= ibm-namespace-scope-operator-bundle
 
 # Options for 'bundle-build'
 CHANNELS ?= v4.2
-DEFAULT_CHANNEL ?= v4.0
+DEFAULT_CHANNEL ?= v4.2
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
 endif
@@ -190,12 +190,13 @@ generate: controller-gen ## Generate code e.g. API etc.
 generate-csv-manifests: operator-sdk ## Generate CSV manifests
 	$(OPERATOR_SDK) generate kustomize manifests
 
-bundle: clis generate manifests ## Generate bundle manifests	
+bundle: clis generate manifests generate-csv-manifests ## Generate bundle manifests	
 	# Generate bundle manifests
 	cd config/manager && $(KUSTOMIZE) edit set image icr.io/cpopen/ibm-namespace-scope-operator=$(ICR_REIGSTRY)/$(OPERATOR_IMAGE_NAME):$(RELEASE_VERSION)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle \
 	-q --version $(RELEASE_VERSION) $(BUNDLE_METADATA_OPTS)
 	- sed -i '$$a\\n# OpenShift annotations.\n  com.redhat.openshift.versions: $(OPENSHIFT_VERSIONS)' bundle/metadata/annotations.yaml
+	- $(YQ) eval-all -i '.spec.relatedImages = load("config/manifests/bases/ibm-namespace-scope-operator.clusterserviceversion.yaml").spec.relatedImages' bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml
 	- $(OPERATOR_SDK) bundle validate ./bundle
 
 ##@ Test

api/v1/namespacescope_types.go

@@ -73,7 +73,8 @@ type NamespaceScope struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// +kubebuilder:pruning:PreserveUnknownFields
-	Spec   NamespaceScopeSpec   `json:"spec,omitempty"`
+	Spec NamespaceScopeSpec `json:"spec,omitempty"`
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Status NamespaceScopeStatus `json:"status,omitempty"`
 }
 

api/v1/zz_generated.deepcopy.go

@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ibm-namespace-scope-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=v4.2
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.0
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v4.2
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2

bundle.Dockerfile

@@ -122,8 +122,8 @@ spec:
                   type: string
                 type: array
             type: object
+            x-kubernetes-preserve-unknown-fields: true
         type: object
-        x-kubernetes-preserve-unknown-fields: true
     served: true
     storage: true
     subresources:

bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml

@@ -5,8 +5,8 @@ annotations:
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: ibm-namespace-scope-operator
   operators.operatorframework.io.bundle.channels.v1: v4.2
-  operators.operatorframework.io.bundle.channel.default.v1: v4.0
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
+  operators.operatorframework.io.bundle.channel.default.v1: v4.2
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
 

bundle/manifests/operator.ibm.com_namespacescopes.yaml

@@ -59,7 +59,7 @@ ifeq (, $(CONTROLLER_GEN))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	GO111MODULE=on go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
+	GO111MODULE=on go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOPATH)/controller-gen

bundle/metadata/annotations.yaml

@@ -122,15 +122,9 @@ spec:
                   type: string
                 type: array
             type: object
+            x-kubernetes-preserve-unknown-fields: true
         type: object
-        x-kubernetes-preserve-unknown-fields: true
     served: true
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null

common/Makefile.common.mk

@@ -6,19 +6,19 @@ metadata:
     capabilities: Seamless Upgrades
     containerImage: icr.io/cpopen/ibm-namespace-scope-operator:4.2.13
     createdAt: "2020-11-2T15:38:33Z"
-    olm.skipRange: '<4.2.13'
-    operators.openshift.io/infrastructure-features: '["disconnected"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.1.0
-    operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-    repository: https://github.com/IBM/ibm-namespace-scope-operator
-    support: IBM
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "true"
     features.operators.openshift.io/proxy-aware: "false"
     features.operators.openshift.io/tls-profiles: "false"
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
+    olm.skipRange: <4.2.13
+    operators.openshift.io/infrastructure-features: '["disconnected"]'
+    operators.operatorframework.io/builder: operator-sdk-v1.1.0
+    operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
+    repository: https://github.com/IBM/ibm-namespace-scope-operator
+    support: IBM
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.ppc64le: supported
@@ -68,6 +68,6 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: icr.io/cpopen/ibm-namespace-scope-operator
+  - image: icr.io/cpopen/ibm-namespace-scope-operator:4.2.13
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
   version: 0.0.0