diff --git a/.mergify.yml b/.mergify.yml index a74a9117e..c2eec418b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,12 +1,12 @@ pull_request_rules: - - name: backport patches to cryostat-v3.0 branch + - name: backport patches to cryostat-v4.0 branch conditions: - base=main - label=backport actions: backport: branches: - - cryostat-v3.0 + - cryostat-v4.0 assignees: - "{{ author }}" - name: auto label PRs from reviewers diff --git a/Makefile b/Makefile index 0af2501f3..a6bac7d58 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ OS = $(shell go env GOOS) ARCH = $(shell go env GOARCH) # Current Operator version -export OPERATOR_VERSION ?= 4.0.0-dev +export OPERATOR_VERSION ?= 4.1.0-dev IMAGE_VERSION ?= $(OPERATOR_VERSION) BUNDLE_VERSION ?= $(IMAGE_VERSION) DEFAULT_NAMESPACE ?= quay.io/cryostat @@ -62,7 +62,7 @@ export APP_NAME ?= Cryostat # Images used by the operator CORE_NAMESPACE ?= $(DEFAULT_NAMESPACE) CORE_NAME ?= cryostat -CORE_VERSION ?= 4.0.0-snapshot +CORE_VERSION ?= latest export CORE_IMG ?= $(CORE_NAMESPACE)/$(CORE_NAME):$(CORE_VERSION) OAUTH2_PROXY_NAMESPACE ?= quay.io/oauth2-proxy OAUTH2_PROXY_NAME ?= oauth2-proxy @@ -71,7 +71,7 @@ export OAUTH2_PROXY_IMG ?= $(OAUTH2_PROXY_NAMESPACE)/$(OAUTH2_PROXY_NAME):$(OAUT OPENSHIFT_OAUTH_PROXY_NAMESPACE ?= quay.io/cryostat OPENSHIFT_OAUTH_PROXY_NAME ?= openshift-oauth-proxy # there is no 'latest' tag for this container -OPENSHIFT_OAUTH_PROXY_VERSION ?= cryostat-v3.0 +OPENSHIFT_OAUTH_PROXY_VERSION ?= go-1.22 export OPENSHIFT_OAUTH_PROXY_IMG ?= $(OPENSHIFT_OAUTH_PROXY_NAMESPACE)/$(OPENSHIFT_OAUTH_PROXY_NAME):$(OPENSHIFT_OAUTH_PROXY_VERSION) DATASOURCE_NAMESPACE ?= $(DEFAULT_NAMESPACE) DATASOURCE_NAME ?= jfr-datasource @@ -121,7 +121,7 @@ ENVTEST_K8S_VERSION ?= 1.26 # 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 ?= 4.0.0-$(shell date -u '+%Y%m%d%H%M%S') +CUSTOM_SCORECARD_VERSION ?= 4.1.0-$(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 @@ -153,17 +153,18 @@ endif KUSTOMIZE_DIR ?= config/default # Optional Red Hat Insights integration ENABLE_INSIGHTS ?= false -ifeq ($(ENABLE_INSIGHTS), true) -KUSTOMIZE_BUNDLE_DIR ?= config/overlays/insights INSIGHTS_PROXY_NAMESPACE ?= registry.redhat.io/3scale-amp2 INSIGHTS_PROXY_NAME ?= apicast-gateway-rhel8 -INSIGHTS_PROXY_VERSION ?= 3scale2.14 +INSIGHTS_PROXY_VERSION ?= 3scale2.15 export INSIGHTS_PROXY_IMG ?= $(INSIGHTS_PROXY_NAMESPACE)/$(INSIGHTS_PROXY_NAME):$(INSIGHTS_PROXY_VERSION) export INSIGHTS_BACKEND ?= console.redhat.com RUNTIMES_INVENTORY_NAMESPACE ?= registry.redhat.io/insights-runtimes-tech-preview RUNTIMES_INVENTORY_NAME ?= runtimes-inventory-rhel8-operator RUNTIMES_INVENTORY_VERSION ?= latest RUNTIMES_INVENTORY_IMG ?= $(RUNTIMES_INVENTORY_NAMESPACE)/$(RUNTIMES_INVENTORY_NAME):$(RUNTIMES_INVENTORY_VERSION) + +ifeq ($(ENABLE_INSIGHTS), true) +KUSTOMIZE_BUNDLE_DIR ?= config/overlays/insights BUNDLE_GEN_FLAGS += --extra-service-accounts cryostat-operator-insights BUNDLE_MODE=ocp else @@ -373,9 +374,7 @@ manifests: controller-gen ## Generate manifests e.g. CRD, RBAC, etc. envsubst < hack/image_tag_patch.yaml.in > config/default/image_tag_patch.yaml envsubst < hack/image_pull_patch.yaml.in > config/default/image_pull_patch.yaml envsubst < hack/plugin_image_pull_patch.yaml.in > config/openshift/plugin_image_pull_patch.yaml -ifeq ($(ENABLE_INSIGHTS), true) envsubst < hack/insights_patch.yaml.in > config/overlays/insights/insights_patch.yaml -endif .PHONY: fmt fmt: add-license ## Run go fmt against code. diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index 6273381d4..6888dfe49 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -23,8 +23,8 @@ metadata: ] capabilities: Seamless Upgrades categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev - createdAt: "2025-02-04T23:08:18Z" + containerImage: quay.io/cryostat/cryostat-operator:4.1.0-dev + createdAt: "2025-02-05T19:21:11Z" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { @@ -48,7 +48,7 @@ metadata: operatorframework.io/arch.amd64: supported operatorframework.io/arch.arm64: supported operatorframework.io/os.linux: supported - name: cryostat-operator.v4.0.0-dev + name: cryostat-operator.v4.1.0-dev namespace: placeholder spec: apiservicedefinitions: {} @@ -1131,9 +1131,9 @@ spec: - name: RELATED_IMAGE_OAUTH2_PROXY value: quay.io/oauth2-proxy/oauth2-proxy:latest - name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY - value: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0 + value: quay.io/cryostat/openshift-oauth-proxy:go-1.22 - name: RELATED_IMAGE_CORE - value: quay.io/cryostat/cryostat:4.0.0-snapshot + value: quay.io/cryostat/cryostat:latest - name: RELATED_IMAGE_DATASOURCE value: quay.io/cryostat/jfr-datasource:latest - name: RELATED_IMAGE_GRAFANA @@ -1152,7 +1152,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/cryostat/cryostat-operator:4.0.0-dev + image: quay.io/cryostat/cryostat-operator:4.1.0-dev imagePullPolicy: Always livenessProbe: httpGet: @@ -1299,9 +1299,9 @@ spec: relatedImages: - image: quay.io/oauth2-proxy/oauth2-proxy:latest name: oauth2-proxy - - image: quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0 + - image: quay.io/cryostat/openshift-oauth-proxy:go-1.22 name: openshift-oauth-proxy - - image: quay.io/cryostat/cryostat:4.0.0-snapshot + - image: quay.io/cryostat/cryostat:latest name: core - image: quay.io/cryostat/jfr-datasource:latest name: datasource @@ -1317,7 +1317,7 @@ spec: name: agent-proxy - image: quay.io/cryostat/cryostat-agent-init:latest name: agent-init - version: 4.0.0-dev + version: 4.1.0-dev webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index 17c591fd2..c68cad9df 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -70,7 +70,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - operator-install - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955 + image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845 labels: suite: cryostat test: operator-install @@ -80,7 +80,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955 + image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845 labels: suite: cryostat test: cryostat-cr @@ -90,7 +90,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-multi-namespace - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955 + image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845 labels: suite: cryostat test: cryostat-multi-namespace @@ -100,7 +100,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-recording - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955 + image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845 labels: suite: cryostat test: cryostat-recording @@ -110,7 +110,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-config-change - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955 + image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845 labels: suite: cryostat test: cryostat-config-change @@ -120,7 +120,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-report - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955 + image: quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845 labels: suite: cryostat test: cryostat-report diff --git a/config/default/image_tag_patch.yaml b/config/default/image_tag_patch.yaml index 3b71f64a8..f6f870736 100644 --- a/config/default/image_tag_patch.yaml +++ b/config/default/image_tag_patch.yaml @@ -12,9 +12,9 @@ spec: - name: RELATED_IMAGE_OAUTH2_PROXY value: "quay.io/oauth2-proxy/oauth2-proxy:latest" - name: RELATED_IMAGE_OPENSHIFT_OAUTH_PROXY - value: "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0" + value: "quay.io/cryostat/openshift-oauth-proxy:go-1.22" - name: RELATED_IMAGE_CORE - value: "quay.io/cryostat/cryostat:4.0.0-snapshot" + value: "quay.io/cryostat/cryostat:latest" - name: RELATED_IMAGE_DATASOURCE value: "quay.io/cryostat/jfr-datasource:latest" - name: RELATED_IMAGE_GRAFANA diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 42e8a8d4d..0968d0b3c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -22,4 +22,4 @@ kind: Kustomization images: - name: controller newName: quay.io/cryostat/cryostat-operator - newTag: 4.0.0-dev + newTag: 4.1.0-dev diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml index 2c05996a9..9a0bc26f9 100644 --- a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml @@ -4,7 +4,7 @@ metadata: annotations: capabilities: Seamless Upgrades categories: Monitoring, Developer Tools - containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev + containerImage: quay.io/cryostat/cryostat-operator:4.1.0-dev description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/config/overlays/insights/insights_patch.yaml b/config/overlays/insights/insights_patch.yaml index 4ba691937..2db8812f4 100644 --- a/config/overlays/insights/insights_patch.yaml +++ b/config/overlays/insights/insights_patch.yaml @@ -11,11 +11,11 @@ spec: - name: insights env: - name: RELATED_IMAGE_INSIGHTS_PROXY - value: "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.14" + value: "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.15" - name: INSIGHTS_BACKEND_DOMAIN value: "console.redhat.com" - name: USER_AGENT_PREFIX - value: "cryostat-operator/4.0.0-dev" + value: "cryostat-operator/4.1.0-dev" --- apiVersion: apps/v1 kind: Deployment diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml index 148dd54e0..e6a43211b 100644 --- a/config/scorecard/patches/custom.config.yaml +++ b/config/scorecard/patches/custom.config.yaml @@ -8,7 +8,7 @@ entrypoint: - cryostat-scorecard-tests - operator-install - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845" labels: suite: cryostat test: operator-install @@ -18,7 +18,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845" labels: suite: cryostat test: cryostat-cr @@ -28,7 +28,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-multi-namespace - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845" labels: suite: cryostat test: cryostat-multi-namespace @@ -38,7 +38,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-recording - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845" labels: suite: cryostat test: cryostat-recording @@ -48,7 +48,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-config-change - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845" labels: suite: cryostat test: cryostat-config-change @@ -58,7 +58,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-report - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20250124171955" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.1.0-20250205191845" labels: suite: cryostat test: cryostat-report diff --git a/hack/insights_patch.yaml.in b/hack/insights_patch.yaml.in index 2af867b1d..9564972e3 100644 --- a/hack/insights_patch.yaml.in +++ b/hack/insights_patch.yaml.in @@ -28,10 +28,6 @@ spec: containers: - name: manager env: - - name: OPERATOR_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - name: INSIGHTS_ENABLED value: "true" - name: INSIGHTS_URL diff --git a/internal/controllers/constants/const_generated.go b/internal/controllers/constants/const_generated.go index 07bb2230a..82bc686b2 100644 --- a/internal/controllers/constants/const_generated.go +++ b/internal/controllers/constants/const_generated.go @@ -5,16 +5,16 @@ package constants const AppName = "Cryostat" // Version of the Cryostat Operator -const OperatorVersion = "4.0.0-dev" +const OperatorVersion = "4.1.0-dev" // Default image tag for the OAuth2 Proxy const DefaultOAuth2ProxyImageTag = "quay.io/oauth2-proxy/oauth2-proxy:latest" // Default image tag for the OpenShift OAuth Proxy -const DefaultOpenShiftOAuthProxyImageTag = "quay.io/cryostat/openshift-oauth-proxy:cryostat-v3.0" +const DefaultOpenShiftOAuthProxyImageTag = "quay.io/cryostat/openshift-oauth-proxy:go-1.22" // Default image tag for the core application image -const DefaultCoreImageTag = "quay.io/cryostat/cryostat:4.0.0-snapshot" +const DefaultCoreImageTag = "quay.io/cryostat/cryostat:latest" // Default image tag for the JFR datasource image const DefaultDatasourceImageTag = "quay.io/cryostat/jfr-datasource:latest"