Merging pull request 453

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> * github.com:confidential-containers/operator: bundle: updates for v0.10.0
confidential-containers · Oct 2, 2024 · 406e1b3 · 406e1b3
2 parents 4bae636 + fca91a3
commit 406e1b3
Show file tree

Hide file tree

Showing 9 changed files with 5,573 additions and 5,047 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.9.0
+VERSION ?= 0.10.0
 ARCH = $(shell uname -m)
 
 # CHANNELS define the bundle channels used in the bundle.

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -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=cc-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.36.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

diff --git a/bundle/manifests/cc-operator.clusterserviceversion.yaml b/bundle/manifests/cc-operator.clusterserviceversion.yaml
@@ -46,10 +46,6 @@ metadata:
                   "mountPath": "/etc/containerd/",
                   "name": "containerd-conf"
                 },
-                {
-                  "mountPath": "/opt/kata/",
-                  "name": "kata-artifacts"
-                },
                 {
                   "mountPath": "/usr/local/bin/",
                   "name": "local-bin"
@@ -74,13 +70,6 @@ metadata:
                   },
                   "name": "containerd-conf"
                 },
-                {
-                  "hostPath": {
-                    "path": "/opt/kata/",
-                    "type": "DirectoryOrCreate"
-                  },
-                  "name": "kata-artifacts"
-                },
                 {
                   "hostPath": {
                     "path": "/usr/local/bin/",
@@ -96,9 +85,9 @@ metadata:
                   "name": "host"
                 }
               ],
-              "payloadImage": "quay.io/kata-containers/kata-deploy:3.7.0",
+              "payloadImage": "quay.io/kata-containers/kata-deploy:3.9.0",
               "postUninstall": {
-                "image": "quay.io/confidential-containers/reqs-payload:6bba65f96532fa280b3996dcad2aad10bed777e6",
+                "image": "quay.io/confidential-containers/reqs-payload:12e8fbc72e927f9d684efe2e1214937f8b0544fc",
                 "volumeMounts": [
                   {
                     "mountPath": "/opt/confidential-containers/",
@@ -160,7 +149,7 @@ metadata:
                 ]
               },
               "preInstall": {
-                "image": "quay.io/confidential-containers/reqs-payload:6bba65f96532fa280b3996dcad2aad10bed777e6",
+                "image": "quay.io/confidential-containers/reqs-payload:12e8fbc72e927f9d684efe2e1214937f8b0544fc",
                 "volumeMounts": [
                   {
                     "mountPath": "/opt/confidential-containers/",
@@ -225,26 +214,31 @@ metadata:
                 {
                   "name": "kata-clh",
                   "pulltype": "",
-                  "snapshotter": "nydus"
+                  "snapshotter": ""
                 },
                 {
                   "name": "kata-qemu",
                   "pulltype": "",
+                  "snapshotter": ""
+                },
+                {
+                  "name": "kata-qemu-coco-dev",
+                  "pulltype": "guest-pull",
                   "snapshotter": "nydus"
                 },
                 {
                   "name": "kata-qemu-tdx",
-                  "pulltype": "",
+                  "pulltype": "guest-pull",
                   "snapshotter": "nydus"
                 },
                 {
                   "name": "kata-qemu-sev",
-                  "pulltype": "",
+                  "pulltype": "guest-pull",
                   "snapshotter": "nydus"
                 },
                 {
                   "name": "kata-qemu-snp",
-                  "pulltype": "",
+                  "pulltype": "guest-pull",
                   "snapshotter": "nydus"
                 }
               ],
@@ -262,11 +256,11 @@ metadata:
       ]
     capabilities: Basic Install
     categories: Security
-    containerImage: quay.io/confidential-containers/operator:v0.9.0
-    createdAt: "2024-08-06T14:14:00Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.30.0
+    containerImage: quay.io/confidential-containers/operator:v0.10.0
+    createdAt: "2024-09-27T20:06:42Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.36.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: cc-operator.v0.9.0
+  name: cc-operator.v0.10.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -406,7 +400,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/confidential-containers/operator:v0.9.0
+                image: quay.io/confidential-containers/operator:v0.10.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -497,5 +491,5 @@ spec:
   provider:
     name: Confidential Containers Community
     url: https://github.com/confidential-containers
-  replaces: cc-operator.v0.8.0
-  version: 0.9.0
+  replaces: cc-operator.v0.9.0
+  version: 0.10.0