From e2565e036e3a0959b0ce5d3ec4d5a628919109c3 Mon Sep 17 00:00:00 2001 From: Elliott Baron Date: Thu, 17 Nov 2022 15:23:23 -0500 Subject: [PATCH] build(version): update versions for 2.2.1-dev --- Makefile | 12 ++++---- bundle.Dockerfile | 3 +- ...yostat-operator.clusterserviceversion.yaml | 28 +++++++++---------- bundle/metadata/annotations.yaml | 3 +- bundle/tests/scorecard/config.yaml | 2 +- config/default/image_pull_patch.yaml | 2 +- config/default/image_tag_patch.yaml | 8 +++--- config/manager/kustomization.yaml | 2 +- ...yostat-operator.clusterserviceversion.yaml | 6 ++-- config/scorecard/patches/custom.config.yaml | 2 +- internal/controllers/const_generated.go | 8 +++--- 11 files changed, 37 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index d0e552ee..c7c904f9 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 +IMAGE_VERSION ?= 2.2.1-dev 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 ?= 2.2.0 +CORE_VERSION ?= 2.2.1-snapshot export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION) DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE) DATASOURCE_NAME ?= jfr-datasource -DATASOURCE_VERSION ?= 2.2.0 +DATASOURCE_VERSION ?= 2.2.1-snapshot export DATASOURCE_IMG ?= $(DATASOURCE_NAMESPACE)/$(DATASOURCE_NAME):$(DATASOURCE_VERSION) GRAFANA_NAMESPACE ?= $(DEFAULT_NAMESPACE) GRAFANA_NAME ?= cryostat-grafana-dashboard -GRAFANA_VERSION ?= 2.2.0 +GRAFANA_VERSION ?= cryostat-v2.2 export GRAFANA_IMG ?= $(GRAFANA_NAMESPACE)/$(GRAFANA_NAME):$(GRAFANA_VERSION) REPORTS_NAMESPACE ?= $(DEFAULT_NAMESPACE) REPORTS_NAME ?= cryostat-reports -REPORTS_VERSION ?= 1.1.0 +REPORTS_VERSION ?= 1.1.1-snapshot export REPORTS_IMG ?= $(REPORTS_NAMESPACE)/$(REPORTS_NAME):$(REPORTS_VERSION) CERT_MANAGER_VERSION ?= 1.7.1 @@ -84,7 +84,7 @@ ENVTEST_K8S_VERSION ?= 1.24 # See: https://github.com/operator-framework/operator-sdk/pull/4762 # # Suffix is the timestamp of the image build, compute with: date -u '+%Y%m%d%H%M%S' -CUSTOM_SCORECARD_VERSION ?= 2.2.0-$(shell date -u '+%Y%m%d%H%M%S') +CUSTOM_SCORECARD_VERSION ?= 2.2.1-$(shell date -u '+%Y%m%d%H%M%S') export CUSTOM_SCORECARD_IMG ?= $(IMAGE_TAG_BASE)-scorecard:$(CUSTOM_SCORECARD_VERSION) DEPLOY_NAMESPACE ?= cryostat-operator-system diff --git a/bundle.Dockerfile b/bundle.Dockerfile index b0070765..dc20d743 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -5,8 +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=cryostat-operator -LABEL operators.operatorframework.io.bundle.channels.v1=stable -LABEL operators.operatorframework.io.bundle.channel.default.v1=stable +LABEL operators.operatorframework.io.bundle.channels.v1=alpha 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 9f5a511a..d3029210 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 - createdAt: "2022-11-15 00:00:00" + containerImage: quay.io/cryostat/cryostat-operator:2.2.1-dev + createdAt: "2022-11-17 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 + name: cryostat-operator.v2.2.1-dev namespace: placeholder spec: apiservicedefinitions: {} @@ -520,19 +520,19 @@ spec: - /manager env: - name: RELATED_IMAGE_CORE - value: quay.io/cryostat/cryostat:2.2.0 + value: quay.io/cryostat/cryostat:2.2.1-snapshot - name: RELATED_IMAGE_DATASOURCE - value: quay.io/cryostat/jfr-datasource:2.2.0 + value: quay.io/cryostat/jfr-datasource:2.2.1-snapshot - name: RELATED_IMAGE_GRAFANA - value: quay.io/cryostat/cryostat-grafana-dashboard:2.2.0 + value: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.2 - name: RELATED_IMAGE_REPORTS - value: quay.io/cryostat/cryostat-reports:1.1.0 + value: quay.io/cryostat/cryostat-reports:1.1.1-snapshot - name: WATCH_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/cryostat/cryostat-operator:2.2.0 - imagePullPolicy: IfNotPresent + image: quay.io/cryostat/cryostat-operator:2.2.1-dev + imagePullPolicy: Always livenessProbe: httpGet: path: /healthz @@ -729,12 +729,12 @@ spec: provider: name: The Cryostat Community relatedImages: - - image: quay.io/cryostat/cryostat:2.2.0 + - image: quay.io/cryostat/cryostat:2.2.1-snapshot name: core - - image: quay.io/cryostat/jfr-datasource:2.2.0 + - image: quay.io/cryostat/jfr-datasource:2.2.1-snapshot name: datasource - - image: quay.io/cryostat/cryostat-grafana-dashboard:2.2.0 + - image: quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.2 name: grafana - - image: quay.io/cryostat/cryostat-reports:1.1.0 + - image: quay.io/cryostat/cryostat-reports:1.1.1-snapshot name: reports - version: 2.2.0 + version: 2.2.1-dev diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 5e70d758..42de6fc5 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,8 +4,7 @@ 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: stable - operators.operatorframework.io.bundle.channel.default.v1: stable + operators.operatorframework.io.bundle.channels.v1: alpha 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/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index ae2bf433..756a2058 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -69,7 +69,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - operator-install - image: quay.io/cryostat/cryostat-operator-scorecard:2.2.0-20221115222145 + image: quay.io/cryostat/cryostat-operator-scorecard:2.2.1-20221117202305 labels: suite: cryostat test: operator-install diff --git a/config/default/image_pull_patch.yaml b/config/default/image_pull_patch.yaml index 0c2c3bca..954a0546 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: "IfNotPresent" + imagePullPolicy: "Always" diff --git a/config/default/image_tag_patch.yaml b/config/default/image_tag_patch.yaml index b5cfc054..76819dd1 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.2.0" + value: "quay.io/cryostat/cryostat:2.2.1-snapshot" - name: RELATED_IMAGE_DATASOURCE - value: "quay.io/cryostat/jfr-datasource:2.2.0" + value: "quay.io/cryostat/jfr-datasource:2.2.1-snapshot" - name: RELATED_IMAGE_GRAFANA - value: "quay.io/cryostat/cryostat-grafana-dashboard:2.2.0" + value: "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.2" - name: RELATED_IMAGE_REPORTS - value: "quay.io/cryostat/cryostat-reports:1.1.0" + value: "quay.io/cryostat/cryostat-reports:1.1.1-snapshot" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 12a9b874..627dfd00 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 + newTag: 2.2.1-dev diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml index 75eca18f..b6963110 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 - createdAt: "2022-11-15 00:00:00" + containerImage: quay.io/cryostat/cryostat-operator:2.2.1-dev + createdAt: "2022-11-17 00:00:00" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { @@ -457,4 +457,4 @@ spec: minKubeVersion: 1.19.0 provider: name: The Cryostat Community - version: 2.2.0-dev + version: 0.0.0 diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml index 5ddb9a9e..96334ea7 100644 --- a/config/scorecard/patches/custom.config.yaml +++ b/config/scorecard/patches/custom.config.yaml @@ -7,7 +7,7 @@ entrypoint: - cryostat-scorecard-tests - operator-install - image: "quay.io/cryostat/cryostat-operator-scorecard:2.2.0-20221115222145" + image: "quay.io/cryostat/cryostat-operator-scorecard:2.2.1-20221117202305" labels: suite: cryostat test: operator-install diff --git a/internal/controllers/const_generated.go b/internal/controllers/const_generated.go index 87b29915..7ee7afb1 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:2.2.0" +const DefaultCoreImageTag = "quay.io/cryostat/cryostat:2.2.1-snapshot" // Default image tag for the JFR datasource image -const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:2.2.0" +const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:2.2.1-snapshot" // Default image tag for the Grafana dashboard image -const DefaultGrafanaImageTag = "quay.io/cryostat/cryostat-grafana-dashboard:2.2.0" +const DefaultGrafanaImageTag = "quay.io/cryostat/cryostat-grafana-dashboard:cryostat-v2.2" // Default image tag for the Grafana dashboard image -const DefaultReportsImageTag = "quay.io/cryostat/cryostat-reports:1.1.0" +const DefaultReportsImageTag = "quay.io/cryostat/cryostat-reports:1.1.1-snapshot"