From c08336e3d4c82021ba468841dc11a71b2ba4db14 Mon Sep 17 00:00:00 2001 From: dd di cesare Date: Fri, 31 May 2024 10:44:10 +0200 Subject: [PATCH] [bundle] Bundle and manifests for release 0.8.0-rc1 --- bundle.Dockerfile | 5 +++-- .../kuadrant-operator.clusterserviceversion.yaml | 16 ++++++++-------- bundle/metadata/annotations.yaml | 5 +++-- bundle/metadata/dependencies.yaml | 6 +++--- config/dependencies/authorino/kustomization.yaml | 2 +- config/dependencies/dns/kustomization.yaml | 2 +- config/dependencies/limitador/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 2 +- .../kuadrant-operator.clusterserviceversion.yaml | 8 ++++---- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index f5f5e8dc8..e4052562b 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,11 +5,12 @@ 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=kuadrant-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha +LABEL operators.operatorframework.io.bundle.channels.v1=preview +LABEL operators.operatorframework.io.bundle.channel.default.v1=preview 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 +LABEL com.redhat.openshift.versions="v4.12" # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 diff --git a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml index 17411c4c8..06d02bccf 100644 --- a/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml +++ b/bundle/manifests/kuadrant-operator.clusterserviceversion.yaml @@ -105,13 +105,13 @@ metadata: ] capabilities: Basic Install categories: Integration & Delivery - containerImage: quay.io/kuadrant/kuadrant-operator:latest - createdAt: "2024-05-07T15:39:41Z" + containerImage: quay.io/kuadrant/kuadrant-operator:v0.8.0-rc1 + createdAt: "2024-05-31T08:35:28Z" operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/Kuadrant/kuadrant-operator support: kuadrant - name: kuadrant-operator.v0.0.0 + name: kuadrant-operator.v0.8.0-rc1 namespace: placeholder spec: apiservicedefinitions: {} @@ -599,8 +599,8 @@ spec: - /manager env: - name: RELATED_IMAGE_WASMSHIM - value: oci://quay.io/kuadrant/wasm-shim:latest - image: quay.io/kuadrant/kuadrant-operator:latest + value: oci://quay.io/kuadrant/wasm-shim:v0.4.0 + image: quay.io/kuadrant/kuadrant-operator:v0.8.0-rc1 livenessProbe: httpGet: path: /healthz @@ -702,7 +702,7 @@ spec: name: Red Hat url: https://github.com/Kuadrant/kuadrant-operator relatedImages: - - image: oci://quay.io/kuadrant/wasm-shim:latest + - image: oci://quay.io/kuadrant/wasm-shim:v0.4.0 name: wasmshim - replaces: kuadrant-operator.v0.0.0-alpha - version: 0.0.0 + replaces: kuadrant-operator.v0.7.1 + version: 0.8.0-rc1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 56d5c4b99..35b98aa7e 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,11 +4,12 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: kuadrant-operator - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.channel.default.v1: alpha + operators.operatorframework.io.bundle.channels.v1: preview + operators.operatorframework.io.bundle.channel.default.v1: preview 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/v3 + com.redhat.openshift.versions: "v4.12" # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml index d8ccdcad1..9bba68d3e 100644 --- a/bundle/metadata/dependencies.yaml +++ b/bundle/metadata/dependencies.yaml @@ -2,15 +2,15 @@ dependencies: - type: olm.package value: packageName: authorino-operator - version: "0.0.0" + version: "0.11.1" - type: olm.package value: packageName: limitador-operator - version: "0.0.0" + version: "0.9.0" - type: olm.package value: packageName: dns-operator - version: "0.0.0" + version: "0.3.0" - type: olm.package value: packageName: cert-manager diff --git a/config/dependencies/authorino/kustomization.yaml b/config/dependencies/authorino/kustomization.yaml index 2281ecbbb..62efc99bd 100644 --- a/config/dependencies/authorino/kustomization.yaml +++ b/config/dependencies/authorino/kustomization.yaml @@ -1,2 +1,2 @@ resources: -- github.com/Kuadrant/authorino-operator/config/deploy?ref=main +- github.com/Kuadrant/authorino-operator/config/deploy?ref=v0.11.1 diff --git a/config/dependencies/dns/kustomization.yaml b/config/dependencies/dns/kustomization.yaml index f7abc9be3..0ec8e1137 100644 --- a/config/dependencies/dns/kustomization.yaml +++ b/config/dependencies/dns/kustomization.yaml @@ -1,5 +1,5 @@ resources: -- github.com/kuadrant/dns-operator/config/default?ref=main +- github.com/kuadrant/dns-operator/config/default?ref=v0.3.0 patches: - path: deployment_patch.yaml diff --git a/config/dependencies/limitador/kustomization.yaml b/config/dependencies/limitador/kustomization.yaml index ca74b6b82..b00ba674f 100644 --- a/config/dependencies/limitador/kustomization.yaml +++ b/config/dependencies/limitador/kustomization.yaml @@ -1,2 +1,2 @@ resources: -- github.com/Kuadrant/limitador-operator/config/default?ref=main +- github.com/Kuadrant/limitador-operator/config/default?ref=v0.9.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f44157fc4..610313d71 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -10,4 +10,4 @@ kind: Kustomization images: - name: controller newName: quay.io/kuadrant/kuadrant-operator - newTag: latest + newTag: v0.8.0-rc1 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index c893739f8..6e449c3a0 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -29,7 +29,7 @@ spec: - /manager env: - name: RELATED_IMAGE_WASMSHIM - value: "oci://quay.io/kuadrant/wasm-shim:latest" + value: "oci://quay.io/kuadrant/wasm-shim:v0.4.0" image: controller:latest name: manager securityContext: diff --git a/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml b/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml index 9a25e50fd..4828d30f1 100644 --- a/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml @@ -5,12 +5,12 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Integration & Delivery - containerImage: quay.io/kuadrant/kuadrant-operator:latest + containerImage: quay.io/kuadrant/kuadrant-operator:v0.8.0-rc1 operators.operatorframework.io/builder: operator-sdk-v1.9.0 operators.operatorframework.io/project_layout: unknown repository: https://github.com/Kuadrant/kuadrant-operator support: kuadrant - name: kuadrant-operator.v0.0.0 + name: kuadrant-operator.v0.8.0-rc1 namespace: placeholder spec: apiservicedefinitions: {} @@ -101,5 +101,5 @@ spec: provider: name: Red Hat url: https://github.com/Kuadrant/kuadrant-operator - replaces: kuadrant-operator.v0.0.0-alpha - version: 0.0.0 + replaces: kuadrant-operator.v0.7.1 + version: 0.8.0-rc1