From 978e04a8b98cd4fa4e4eb843b1dd196b3d666271 Mon Sep 17 00:00:00 2001 From: Elliott Baron Date: Wed, 16 Nov 2022 14:55:58 -0500 Subject: [PATCH] build(version): update versions for 2.2.0 (#495) --- Makefile | 10 +++---- bundle.Dockerfile | 3 +- ...yostat-operator.clusterserviceversion.yaml | 28 +++++++++---------- bundle/metadata/annotations.yaml | 3 +- config/default/image_pull_patch.yaml | 2 +- config/default/image_tag_patch.yaml | 8 +++--- config/manager/kustomization.yaml | 2 +- ...yostat-operator.clusterserviceversion.yaml | 4 +-- internal/controllers/const_generated.go | 8 +++--- 9 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index cd5241af..d0e552ee 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ OS = $(shell go env GOOS) ARCH = $(shell go env GOARCH) # Current Operator version -IMAGE_VERSION ?= 2.2.0-dev +IMAGE_VERSION ?= 2.2.0 BUNDLE_VERSION ?= $(IMAGE_VERSION) DEFAULT_NAMESPACE ?= quay.io/cryostat IMAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE) @@ -54,19 +54,19 @@ export APP_NAME ?= Cryostat # Images used by the operator CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE) CORE_NAME ?= cryostat -CORE_VERSION ?= latest +CORE_VERSION ?= 2.2.0 export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION) DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE) DATASOURCE_NAME ?= jfr-datasource -DATASOURCE_VERSION ?= latest +DATASOURCE_VERSION ?= 2.2.0 export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION) GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE) GRAFANA_NAME ?= cryostat-grafana-dashboard -GRAFANA_VERSION ?= latest +GRAFANA_VERSION ?= 2.2.0 export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION) REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE) REPORTS_NAME ?= cryostat-reports -REPORTS_VERSION ?= latest +REPORTS_VERSION ?= 1.1.0 export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION) CERT_MANAGER_VERSION ?= 1.7.1 diff --git a/bundle.Dockerfile b/bundle.Dockerfile index dc20d743..b0070765 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,7 +5,8 @@ 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=cryostat-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha +LABEL operators.operatorframework.io.bundle.channels.v1=stable +LABEL operators.operatorframework.io.bundle.channel.default.v1=stable LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.2 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/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index b127b022..9f5a511a 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -30,8 +30,8 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:2.2.0-dev - createdAt: "2022-10-31 00:00:00" + containerImage: quay.io/cryostat/cryostat-operator:2.2.0 + createdAt: "2022-11-15 00:00:00" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { @@ -52,7 +52,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: github.com/cryostatio/cryostat-operator support: Cryostat Community - name: cryostat-operator.v2.2.0-dev + name: cryostat-operator.v2.2.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -520,19 +520,19 @@ spec: - /manager env: - name: RELATED_IMAGE_CORE - value: quay.io/cryostat/cryostat:latest + value: quay.io/cryostat/cryostat:2.2.0 - name: RELATED_IMAGE_DATASOURCE - value: quay.io/cryostat/jfr-datasource:latest + value: quay.io/cryostat/jfr-datasource:2.2.0 - name: RELATED_IMAGE_GRAFANA - value: quay.io/cryostat/cryostat-grafana-dashboard:latest + value: quay.io/cryostat/cryostat-grafana-dashboard:2.2.0 - name: RELATED_IMAGE_REPORTS - value: quay.io/cryostat/cryostat-reports:latest + value: quay.io/cryostat/cryostat-reports:1.1.0 - name: WATCH_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/cryostat/cryostat-operator:2.2.0-dev - imagePullPolicy: Always + image: quay.io/cryostat/cryostat-operator:2.2.0 + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz @@ -729,12 +729,12 @@ spec: provider: name: The Cryostat Community relatedImages: - - image: quay.io/cryostat/cryostat:latest + - image: quay.io/cryostat/cryostat:2.2.0 name: core - - image: quay.io/cryostat/jfr-datasource:latest + - image: quay.io/cryostat/jfr-datasource:2.2.0 name: datasource - - image: quay.io/cryostat/cryostat-grafana-dashboard:latest + - image: quay.io/cryostat/cryostat-grafana-dashboard:2.2.0 name: grafana - - image: quay.io/cryostat/cryostat-reports:latest + - image: quay.io/cryostat/cryostat-reports:1.1.0 name: reports - version: 2.2.0-dev + version: 2.2.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 42de6fc5..5e70d758 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,7 +4,8 @@ annotations: operators.operatorframework.io.bundle.manifests.v1: manifests/ operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: cryostat-operator - operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.bundle.channels.v1: stable + operators.operatorframework.io.bundle.channel.default.v1: stable operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.2 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/default/image_pull_patch.yaml b/config/default/image_pull_patch.yaml index 954a0546..0c2c3bca 100644 --- a/config/default/image_pull_patch.yaml +++ b/config/default/image_pull_patch.yaml @@ -8,4 +8,4 @@ spec: spec: containers: - name: manager - imagePullPolicy: "Always" + imagePullPolicy: "IfNotPresent" diff --git a/config/default/image_tag_patch.yaml b/config/default/image_tag_patch.yaml index 32f0912c..b5cfc054 100644 --- a/config/default/image_tag_patch.yaml +++ b/config/default/image_tag_patch.yaml @@ -10,10 +10,10 @@ spec: - name: manager env: - name: RELATED_IMAGE_CORE - value: "quay.io/cryostat/cryostat:latest" + value: "quay.io/cryostat/cryostat:2.2.0" - name: RELATED_IMAGE_DATASOURCE - value: "quay.io/cryostat/jfr-datasource:latest" + value: "quay.io/cryostat/jfr-datasource:2.2.0" - name: RELATED_IMAGE_GRAFANA - value: "quay.io/cryostat/cryostat-grafana-dashboard:latest" + value: "quay.io/cryostat/cryostat-grafana-dashboard:2.2.0" - name: RELATED_IMAGE_REPORTS - value: "quay.io/cryostat/cryostat-reports:latest" + value: "quay.io/cryostat/cryostat-reports:1.1.0" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index fc84d114..12a9b874 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/cryostat/cryostat-operator - newTag: 2.2.0-dev + newTag: 2.2.0 diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml index 44c8f8d1..75eca18f 100644 --- a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml @@ -18,8 +18,8 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:2.2.0-dev - createdAt: "2022-10-31 00:00:00" + containerImage: quay.io/cryostat/cryostat-operator:2.2.0 + createdAt: "2022-11-15 00:00:00" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/internal/controllers/const_generated.go b/internal/controllers/const_generated.go index b80c1582..87b29915 100644 --- a/internal/controllers/const_generated.go +++ b/internal/controllers/const_generated.go @@ -5,13 +5,13 @@ package controllers const AppName = "Cryostat" // Default image tag for the core application image -const DefaultCoreImageTag = "quay.io/cryostat/cryostat:latest" +const DefaultCoreImageTag = "quay.io/cryostat/cryostat:2.2.0" // Default image tag for the JFR datasource image -const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:latest" +const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:2.2.0" // Default image tag for the Grafana dashboard image -const DefaultGrafanaImageTag = "quay.io/cryostat/cryostat-grafana-dashboard:latest" +const DefaultGrafanaImageTag = "quay.io/cryostat/cryostat-grafana-dashboard:2.2.0" // Default image tag for the Grafana dashboard image -const DefaultReportsImageTag = "quay.io/cryostat/cryostat-reports:latest" +const DefaultReportsImageTag = "quay.io/cryostat/cryostat-reports:1.1.0"