From b94d2efa58be89715ca4aa66163388bcecbccd59 Mon Sep 17 00:00:00 2001 From: craig Date: Tue, 26 Nov 2024 15:49:39 +0000 Subject: [PATCH] prepare release-0.12 Signed-off-by: craig rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED --- bundle.Dockerfile | 2 +- .../manifests/dns-operator.clusterserviceversion.yaml | 11 ++++++----- bundle/metadata/annotations.yaml | 2 +- charts/dns-operator/Chart.yaml | 4 ++-- charts/dns-operator/templates/manifests.yaml | 2 +- config/deploy/olm/catalogsource.yaml | 2 +- config/deploy/olm/subscription.yaml | 2 +- config/manager/kustomization.yaml | 2 +- .../bases/dns-operator.clusterserviceversion.yaml | 7 ++++--- make/release.mk | 8 ++++++++ 10 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 make/release.mk diff --git a/bundle.Dockerfile b/bundle.Dockerfile index f778d203..b8d79174 100644 --- a/bundle.Dockerfile +++ b/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=dns-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha +LABEL operators.operatorframework.io.bundle.channels.v1=stable LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 diff --git a/bundle/manifests/dns-operator.clusterserviceversion.yaml b/bundle/manifests/dns-operator.clusterserviceversion.yaml index d522d78b..ef01b3a7 100644 --- a/bundle/manifests/dns-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dns-operator.clusterserviceversion.yaml @@ -57,14 +57,14 @@ metadata: ] capabilities: Basic Install categories: Integration & Delivery - containerImage: quay.io/kuadrant/dns-operator:latest - createdAt: "2024-11-26T11:14:48Z" + containerImage: quay.io/kuadrant/dns-operator:v0.12.0 + createdAt: "2024-11-26T15:47:58Z" description: A Kubernetes Operator to manage the lifecycle of DNS resources operators.operatorframework.io/builder: operator-sdk-v1.33.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/kuadrant/dns-operator support: kuadrant - name: dns-operator.v0.0.0 + name: dns-operator.v0.12.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -182,7 +182,7 @@ spec: - /manager env: - name: WATCH_NAMESPACES - image: quay.io/kuadrant/dns-operator:latest + image: quay.io/kuadrant/dns-operator:v0.12.0 livenessProbe: httpGet: path: /healthz @@ -276,4 +276,5 @@ spec: minKubeVersion: 1.8.0 provider: name: Red Hat - version: 0.0.0 + replaces: dns-operator.v0.11.0 + version: 0.12.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index bbad40c6..c068011f 100644 --- a/bundle/metadata/annotations.yaml +++ b/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: dns-operator - operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.bundle.channels.v1: stable operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 diff --git a/charts/dns-operator/Chart.yaml b/charts/dns-operator/Chart.yaml index a9091d1f..9a442048 100644 --- a/charts/dns-operator/Chart.yaml +++ b/charts/dns-operator/Chart.yaml @@ -12,8 +12,8 @@ sources: kubeVersion: ">=1.19.0-0" type: application # The version will be properly set when the chart is released matching the operator version -version: "0.0.0" -appVersion: "0.0.0" +version: "0.12.0" +appVersion: "0.12.0" maintainers: - email: mnairn@redhat.com name: Michael Nairn diff --git a/charts/dns-operator/templates/manifests.yaml b/charts/dns-operator/templates/manifests.yaml index 250f6200..e97f5d75 100644 --- a/charts/dns-operator/templates/manifests.yaml +++ b/charts/dns-operator/templates/manifests.yaml @@ -911,7 +911,7 @@ spec: env: - name: WATCH_NAMESPACES value: "" - image: quay.io/kuadrant/dns-operator:latest + image: quay.io/kuadrant/dns-operator:v0.12.0 livenessProbe: httpGet: path: /healthz diff --git a/config/deploy/olm/catalogsource.yaml b/config/deploy/olm/catalogsource.yaml index 7f67ed83..e93a49ef 100644 --- a/config/deploy/olm/catalogsource.yaml +++ b/config/deploy/olm/catalogsource.yaml @@ -4,6 +4,6 @@ metadata: name: dns-operator-catalog spec: sourceType: grpc - image: quay.io/kuadrant/dns-operator-catalog:latest + image: quay.io/kuadrant/dns-operator-catalog:v0.12.0 displayName: DNS Operators publisher: grpc diff --git a/config/deploy/olm/subscription.yaml b/config/deploy/olm/subscription.yaml index 141ebab5..39ddb2c0 100644 --- a/config/deploy/olm/subscription.yaml +++ b/config/deploy/olm/subscription.yaml @@ -6,4 +6,4 @@ spec: source: dns-operator-catalog sourceNamespace: dns-operator-system name: dns-operator - channel: "alpha" + channel: "stable" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a2d3dac0..dcc4fb37 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -7,4 +7,4 @@ kind: Kustomization images: - name: controller newName: quay.io/kuadrant/dns-operator - newTag: latest + newTag: v0.12.0 diff --git a/config/manifests/bases/dns-operator.clusterserviceversion.yaml b/config/manifests/bases/dns-operator.clusterserviceversion.yaml index cb6132fb..74a94c38 100644 --- a/config/manifests/bases/dns-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dns-operator.clusterserviceversion.yaml @@ -5,11 +5,11 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Integration & Delivery - containerImage: quay.io/kuadrant/dns-operator:latest + containerImage: quay.io/kuadrant/dns-operator:v0.12.0 description: A Kubernetes Operator to manage the lifecycle of DNS resources repository: https://github.com/kuadrant/dns-operator support: kuadrant - name: dns-operator.v0.0.0 + name: dns-operator.v0.12.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -61,4 +61,5 @@ spec: minKubeVersion: 1.8.0 provider: name: Red Hat - version: 0.0.0 + replaces: dns-operator.v0.11.0 + version: 0.12.0 diff --git a/make/release.mk b/make/release.mk new file mode 100644 index 00000000..c699f99a --- /dev/null +++ b/make/release.mk @@ -0,0 +1,8 @@ +#Release default values +IMG=quay.io/kuadrant/dns-operator:v0.12.0 +BUNDLE_IMG=quay.io/kuadrant/dns-operator-bundle:v0.12.0 +CATALOG_IMG=quay.io/kuadrant/dns-operator-catalog:v0.12.0 +CHANNELS=stable +BUNDLE_CHANNELS=--channels=stable +VERSION=0.12.0 +REPLACES_VERSION=0.11.0