openshift#796

Author: kaovilai

Makefile

@@ -270,10 +270,8 @@ operator-sdk:
 bundle: manifests kustomize operator-sdk yq ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
-	# Removes placeholder velero deployment used so `$(OPERATOR_SDK) generate bundle` adds velero service account and role to bundle CSV using yq. See https://github.com/mikefarah/yq/#install
-	$(YQ) eval 'del(.spec.install.spec.deployments.1)' bundle/manifests/oadp-operator.clusterserviceversion.yaml > bundle/manifests/oadp-operator.clusterserviceversion.yaml.yqresult
-	mv bundle/manifests/oadp-operator.clusterserviceversion.yaml.yqresult bundle/manifests/oadp-operator.clusterserviceversion.yaml
+	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --extra-service-accounts "velero" --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
+	@make nullable-crds-bundle nullable-crds-config # patch nullables in CRDs
 	# Copy updated bundle.Dockerfile to CI's Dockerfile.bundle
 	# TODO: update CI to use generated one
 	cp bundle.Dockerfile build/Dockerfile.bundle

build/Dockerfile.bundle

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable-1.0
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-1.0
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.21.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle.Dockerfile

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable-1.0
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-1.0
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.21.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle/manifests/oadp-operator.clusterserviceversion.yaml

@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: oadp-operator
   operators.operatorframework.io.bundle.channels.v1: stable-1.0
   operators.operatorframework.io.bundle.channel.default.v1: stable-1.0
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.21.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.23.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 

bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml

@@ -37,7 +37,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
-            value: quay.io/konveyor/registry:latest
           - name: RELATED_IMAGE_VELERO
             value: quay.io/konveyor/velero:oadp-1.0
           - name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER

bundle/metadata/annotations.yaml

@@ -23,7 +23,7 @@ metadata:
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: oadp-operator.v99.0.0
+  name: oadp-operator.v1.0.5
   namespace: openshift-adp
 spec:
   apiservicedefinitions: {}

config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml

@@ -3,6 +3,5 @@ resources:
 - velero-service_account.yaml
 - velero-role.yaml
 - velero-role_binding.yaml
-- velero.yaml
 - dpa_editor_role.yaml
 - dpa_viewer_role.yaml