From efec98e85769187f3b4cbcdfb59dc33631b3711d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 17:34:33 -0400 Subject: [PATCH] fix(reports): update deprecated quarkus properties (backport #818) (#819) * fix(reports): update deprecated quarkus properties (#818) (cherry picked from commit 0a426ad312bd1a247753e50abfe40cdfcdb7c28d) # Conflicts: # bundle/manifests/cryostat-operator.clusterserviceversion.yaml # config/scorecard/patches/custom.config.yaml * fixup! fix(reports): update deprecated quarkus properties (#818) * regenerate, update scorecard image * correct openshift-oauth-proxy image tag --------- Co-authored-by: Ming Yu Wang <90855268+mwangggg@users.noreply.github.com> Co-authored-by: Andrew Azores --- .../cryostat-operator.clusterserviceversion.yaml | 2 +- config/scorecard/patches/custom.config.yaml | 12 ++++++------ .../resource_definitions/resource_definitions.go | 4 ++-- internal/controllers/const_generated.go | 2 +- internal/test/resources.go | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index ab22fedc9..abbe21a29 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -53,7 +53,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring, Developer Tools containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev - createdAt: "2024-05-08T18:54:35Z" + createdAt: "2024-05-10T19:40:13Z" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml index 39c8ea87f..30b927074 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:3.0.0-20240416210645" + image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240510194331" labels: suite: cryostat test: operator-install @@ -18,7 +18,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240416210645" + image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240510194331" labels: suite: cryostat test: cryostat-cr @@ -28,7 +28,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-multi-namespace - image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240416210645" + image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240510194331" labels: suite: cryostat test: cryostat-multi-namespace @@ -38,7 +38,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-recording - image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240416210645" + image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240510194331" labels: suite: cryostat test: cryostat-recording @@ -48,7 +48,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-config-change - image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240416210645" + image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240510194331" labels: suite: cryostat test: cryostat-config-change @@ -58,7 +58,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-report - image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240416210645" + image: "quay.io/cryostat/cryostat-operator-scorecard:3.0.0-20240510194331" labels: suite: cryostat test: cryostat-report diff --git a/internal/controllers/common/resource_definitions/resource_definitions.go b/internal/controllers/common/resource_definitions/resource_definitions.go index 2a01cf753..38f7f8d6e 100644 --- a/internal/controllers/common/resource_definitions/resource_definitions.go +++ b/internal/controllers/common/resource_definitions/resource_definitions.go @@ -492,11 +492,11 @@ func NewPodForReports(cr *model.CryostatInstance, imageTags *ImageTags, tls *TLS Value: strconv.Itoa(int(constants.ReportsContainerPort)), }, { - Name: "QUARKUS_HTTP_SSL_CERTIFICATE_KEY_FILE", + Name: "QUARKUS_HTTP_SSL_CERTIFICATE_KEY_FILES", Value: fmt.Sprintf("/var/run/secrets/operator.cryostat.io/%s/%s", tls.ReportsSecret, corev1.TLSPrivateKeyKey), }, { - Name: "QUARKUS_HTTP_SSL_CERTIFICATE_FILE", + Name: "QUARKUS_HTTP_SSL_CERTIFICATE_FILES", Value: fmt.Sprintf("/var/run/secrets/operator.cryostat.io/%s/%s", tls.ReportsSecret, corev1.TLSCertKey), }, { diff --git a/internal/controllers/const_generated.go b/internal/controllers/const_generated.go index 4009d3343..41ae4e3e4 100644 --- a/internal/controllers/const_generated.go +++ b/internal/controllers/const_generated.go @@ -11,7 +11,7 @@ const OperatorVersion = "3.0.0-dev" const DefaultOAuth2ProxyImageTag = "quay.io/oauth2-proxy/oauth2-proxy:latest" // Default image tag for the OpenShift OAuth Proxy -const DefaultOpenShiftOAuthProxyImageTag = "quay.io/andrewazores/openshift-oauth-proxy:test-14" +const DefaultOpenShiftOAuthProxyImageTag = "quay.io/openshift/origin-oauth-proxy:latest" // Default image tag for the core application image const DefaultCoreImageTag = "quay.io/cryostat/cryostat:3.0.0-snapshot" diff --git a/internal/test/resources.go b/internal/test/resources.go index e1bb9d100..497d61de2 100644 --- a/internal/test/resources.go +++ b/internal/test/resources.go @@ -1431,10 +1431,10 @@ func (r *TestResources) NewReportsEnvironmentVariables(resources *corev1.Resourc Name: "QUARKUS_HTTP_SSL_PORT", Value: "10000", }, corev1.EnvVar{ - Name: "QUARKUS_HTTP_SSL_CERTIFICATE_KEY_FILE", + Name: "QUARKUS_HTTP_SSL_CERTIFICATE_KEY_FILES", Value: fmt.Sprintf("/var/run/secrets/operator.cryostat.io/%s-reports-tls/tls.key", r.Name), }, corev1.EnvVar{ - Name: "QUARKUS_HTTP_SSL_CERTIFICATE_FILE", + Name: "QUARKUS_HTTP_SSL_CERTIFICATE_FILES", Value: fmt.Sprintf("/var/run/secrets/operator.cryostat.io/%s-reports-tls/tls.crt", r.Name), }, corev1.EnvVar{ Name: "QUARKUS_HTTP_INSECURE_REQUESTS",