Merge pull request #439 from securesign/release-1.0-make-bundle

run make bundle

Makefile

@@ -11,7 +11,7 @@ VERSION ?= 1.0.2
 # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
 # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
 
-CHANNELS="stable,stable-v1.0"
+CHANNELS="stable,stable-v1.0,candidate-v1.0"
 # ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
 # endif
@@ -34,7 +34,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # redhat.com/operator-bundle:$VERSION and redhat.com/operator-catalog:$VERSION.
 IMAGE_TAG_BASE ?= registry.redhat.io/rhtas/rhtas-rhel9-operator
-IMAGE_DIGEST ?= sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
+IMAGE_DIGEST ?= sha256:2af6c95f7688c8cc786de7f495949558a8b4572977251c9f9a94451539b03c2b
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

bundle.Dockerfile

@@ -5,7 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=rhtas-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=stable,stable-v1.0
+LABEL operators.operatorframework.io.bundle.channels.v1=candidate-v1.0
 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/v3

bundle/manifests/rhtas-operator.clusterserviceversion.yaml

@@ -191,8 +191,8 @@ metadata:
         }
       ]
     capabilities: Seamless Upgrades
-    containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
-    createdAt: "2024-05-30T12:33:45Z"
+    containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:2af6c95f7688c8cc786de7f495949558a8b4572977251c9f9a94451539b03c2b
+    createdAt: "2024-06-12T13:17:48Z"
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
@@ -737,7 +737,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
+                image: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:2af6c95f7688c8cc786de7f495949558a8b4572977251c9f9a94451539b03c2b
                 livenessProbe:
                   httpGet:
                     path: /healthz

bundle/metadata/annotations.yaml

@@ -4,7 +4,7 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: rhtas-operator
-  operators.operatorframework.io.bundle.channels.v1: stable,stable-v1.0
+  operators.operatorframework.io.bundle.channels.v1: candidate-v1.0
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.34.1
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

config/manager/kustomization.yaml

@@ -3,6 +3,6 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- digest: sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
+- digest: sha256:2af6c95f7688c8cc786de7f495949558a8b4572977251c9f9a94451539b03c2b
   name: controller
   newName: registry.redhat.io/rhtas/rhtas-rhel9-operator

config/manifests/bases/rhtas-operator.clusterserviceversion.yaml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Seamless Upgrades
-    containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:a21f7128694a64989bf0d84a7a7da4c1ffc89edf62d594dc8bea7bcfe9ac08d3
+    containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:2af6c95f7688c8cc786de7f495949558a8b4572977251c9f9a94451539b03c2b
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"