From b4e547e9f5f33d12bf2506e9f363aedc0e84d976 Mon Sep 17 00:00:00 2001 From: Elliott Baron Date: Thu, 12 May 2022 15:33:43 -0400 Subject: [PATCH] build(version): set versions for 2.1.0 release (#395) --- Makefile | 10 +++++----- bundle.Dockerfile | 3 ++- ...yostat-operator.clusterserviceversion.yaml | 20 +++++++++---------- 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 | 6 +++--- .../imagetag_generated.go | 8 ++++---- 9 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 4fd861f8..4a1a3918 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ SHELL := /bin/bash # Current Operator version -IMAGE_VERSION ?= 2.1.0-dev +IMAGE_VERSION ?= 2.1.0 BUNDLE_VERSION ?= $(IMAGE_VERSION) DEFAULT_NAMESPACE ?= quay.io/cryostat IMAGE_NAMESPACE ?= $(DEFAULT_NAMESPACE) @@ -28,19 +28,19 @@ CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false" # Images used by the operator CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE) CORE_NAME ?= cryostat -CORE_VERSION ?= 2.1.0-SNAPSHOT +CORE_VERSION ?= 2.1.0 export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION) DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE) DATASOURCE_NAME ?= jfr-datasource -DATASOURCE_VERSION ?= 2.0.0 +DATASOURCE_VERSION ?= 2.1.0 export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION) GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE) GRAFANA_NAME ?= cryostat-grafana-dashboard -GRAFANA_VERSION ?= 2.0.0 +GRAFANA_VERSION ?= 2.1.0 export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION) REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE) REPORTS_NAME ?= cryostat-reports -REPORTS_VERSION ?= 1.0.0-SNAPSHOT +REPORTS_VERSION ?= 1.0.0 export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION) CERT_MANAGER_VERSION ?= 1.5.3 diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 223adc88..ea0f5458 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.project_layout=go.kubebuilder.io/v3 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index a2e3f0e1..39ccdd0e 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -62,8 +62,8 @@ metadata: ] capabilities: Basic Install categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:2.1.0-dev - createdAt: "2021-04-30 00:00:00" + containerImage: quay.io/cryostat/cryostat-operator:2.1.0 + createdAt: "2022-05-12 00:00:00" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { @@ -85,7 +85,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: github.com/cryostatio/cryostat-operator support: Cryostat Community - name: cryostat-operator.v2.1.0-dev + name: cryostat-operator.v2.1.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -480,19 +480,19 @@ spec: - /manager env: - name: RELATED_IMAGE_CORE - value: quay.io/cryostat/cryostat:2.1.0-SNAPSHOT + value: quay.io/cryostat/cryostat:2.1.0 - name: RELATED_IMAGE_DATASOURCE - value: quay.io/cryostat/jfr-datasource:2.0.0 + value: quay.io/cryostat/jfr-datasource:2.1.0 - name: RELATED_IMAGE_GRAFANA - value: quay.io/cryostat/cryostat-grafana-dashboard:2.0.0 + value: quay.io/cryostat/cryostat-grafana-dashboard:2.1.0 - name: RELATED_IMAGE_REPORTS - value: quay.io/cryostat/cryostat-reports:1.0.0-SNAPSHOT + value: quay.io/cryostat/cryostat-reports:1.0.0 - name: WATCH_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/cryostat/cryostat-operator:2.1.0-dev - imagePullPolicy: Always + image: quay.io/cryostat/cryostat-operator:2.1.0 + imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /healthz @@ -740,4 +740,4 @@ spec: maturity: stable provider: name: The Cryostat Community - version: 2.1.0-dev + version: 2.1.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 18020928..a5808ca7 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.project_layout: go.kubebuilder.io/v3 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.builder: operator-sdk-v1.4.0+git 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 99241163..eb156eb1 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:2.1.0-SNAPSHOT" + value: "quay.io/cryostat/cryostat:2.1.0" - name: RELATED_IMAGE_DATASOURCE - value: "quay.io/cryostat/jfr-datasource:2.0.0" + value: "quay.io/cryostat/jfr-datasource:2.1.0" - name: RELATED_IMAGE_GRAFANA - value: "quay.io/cryostat/cryostat-grafana-dashboard:2.0.0" + value: "quay.io/cryostat/cryostat-grafana-dashboard:2.1.0" - name: RELATED_IMAGE_REPORTS - value: "quay.io/cryostat/cryostat-reports:1.0.0-SNAPSHOT" + value: "quay.io/cryostat/cryostat-reports:1.0.0" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a5bfa654..c6518ee2 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.1.0-dev + newTag: 2.1.0 diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml index d8638d35..3807915a 100644 --- a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml @@ -50,8 +50,8 @@ metadata: ] capabilities: Basic Install categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:2.1.0-dev - createdAt: "2021-04-30 00:00:00" + containerImage: quay.io/cryostat/cryostat-operator:2.1.0 + createdAt: "2022-05-12 00:00:00" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { @@ -418,4 +418,4 @@ spec: maturity: stable provider: name: The Cryostat Community - version: 2.1.0-dev + version: 2.1.0 diff --git a/internal/controllers/common/resource_definitions/imagetag_generated.go b/internal/controllers/common/resource_definitions/imagetag_generated.go index 50d8f58e..d83313a9 100644 --- a/internal/controllers/common/resource_definitions/imagetag_generated.go +++ b/internal/controllers/common/resource_definitions/imagetag_generated.go @@ -2,13 +2,13 @@ package resource_definitions // Default image tag for the core application image -const DefaultCoreImageTag = "quay.io/cryostat/cryostat:2.1.0-SNAPSHOT" +const DefaultCoreImageTag = "quay.io/cryostat/cryostat:2.1.0" // Default image tag for the JFR datasource image -const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:2.0.0" +const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:2.1.0" // Default image tag for the Grafana dashboard image -const DefaultGrafanaImageTag = "quay.io/cryostat/cryostat-grafana-dashboard:2.0.0" +const DefaultGrafanaImageTag = "quay.io/cryostat/cryostat-grafana-dashboard:2.1.0" // Default image tag for the Grafana dashboard image -const DefaultReportsImageTag = "quay.io/cryostat/cryostat-reports:1.0.0-SNAPSHOT" +const DefaultReportsImageTag = "quay.io/cryostat/cryostat-reports:1.0.0"