From 3549d5b31ffbaff5aef1e8152911edd4225dc8bc Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Tue, 5 Sep 2023 14:28:14 -0400 Subject: [PATCH] Bump compatibility from 4.10-4.12 to 4.10-4.14 (#448) --- .jenkins/README.md | 2 +- .jenkins/agent/Dockerfile | 2 +- build/stf-run-ci/defaults/main.yml | 2 +- build/stf-run-ci/tasks/create_catalog.yml | 4 ++-- deploy/olm-catalog/service-telemetry-operator/Dockerfile.in | 2 +- .../service-telemetry-operator/metadata/properties.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.jenkins/README.md b/.jenkins/README.md index 2085f21d3..f39f1b771 100644 --- a/.jenkins/README.md +++ b/.jenkins/README.md @@ -40,7 +40,7 @@ export SMEE_CHANNEL= #(just the slug, not the whole URL) export GH_ORG= export JENKINS_URL=$(oc get route jenkins -ojsonpath='{.spec.host}') # This is for labelling the status that is returned to github -export OCP_VERSION= # e.g. 4.12 +export OCP_VERSION= # e.g. 4.14 for f in deploy/*; do envsubst < "${f}" | oc apply -f - diff --git a/.jenkins/agent/Dockerfile b/.jenkins/agent/Dockerfile index c41fb9c69..ab7f97cb3 100644 --- a/.jenkins/agent/Dockerfile +++ b/.jenkins/agent/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/openshift/origin-jenkins-agent-base:latest # pass --build-arg OC_CLIENT_VERSION= to build stage to change client version -ARG OC_CLIENT_VERSION="4.12" +ARG OC_CLIENT_VERSION="4.13" RUN curl -LO "https://github.com/operator-framework/operator-sdk/releases/download/v0.19.4/operator-sdk-v0.19.4-x86_64-linux-gnu" && \ chmod +x operator-sdk-v0.19.4-x86_64-linux-gnu && mv operator-sdk-v0.19.4-x86_64-linux-gnu /usr/local/bin/operator-sdk diff --git a/build/stf-run-ci/defaults/main.yml b/build/stf-run-ci/defaults/main.yml index 7b51439b1..502eb8194 100644 --- a/build/stf-run-ci/defaults/main.yml +++ b/build/stf-run-ci/defaults/main.yml @@ -35,7 +35,7 @@ __service_telemetry_bundle_image_path: "quay.io/infrawatch-operators/service-tel __smart_gateway_bundle_image_path: "quay.io/infrawatch-operators/smart-gateway-operator-bundle:nightly-head" default_operator_registry_image_base: registry.redhat.io/openshift4/ose-operator-registry -default_operator_registry_image_tag: v4.12 +default_operator_registry_image_tag: v4.13 elasticsearch_version: 7.16.1 diff --git a/build/stf-run-ci/tasks/create_catalog.yml b/build/stf-run-ci/tasks/create_catalog.yml index 2134be017..3ad667c4e 100644 --- a/build/stf-run-ci/tasks/create_catalog.yml +++ b/build/stf-run-ci/tasks/create_catalog.yml @@ -76,7 +76,7 @@ dockerfile: | # The base image is expected to contain # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe - FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12 + FROM registry.redhat.io/openshift4/ose-operator-registry:v4.13 COPY --chmod=666 index.yaml /configs/ @@ -95,7 +95,7 @@ dockerStrategy: from: kind: ImageStreamTag - name: ose-operator-registry:v4.12 + name: ose-operator-registry:v4.13 volumes: - mounts: - destinationPath: /opt/app-root/auth diff --git a/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in b/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in index 182dbf160..c3e7aa29e 100644 --- a/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in +++ b/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in @@ -13,7 +13,7 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4 LABEL operators.operatorframework.io.metrics.project_layout=ansible LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.openshift.versions="v4.10-v4.12" +LABEL com.redhat.openshift.versions="v4.10-v4.14" LABEL com.redhat.delivery.backport=false LABEL com.redhat.component="service-telemetry-operator-bundle-container" \ diff --git a/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml b/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml index 2905d1189..63f6bd1cd 100644 --- a/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml +++ b/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml @@ -1,6 +1,6 @@ properties: - type: olm.maxOpenShiftVersion - value: "4.12" + value: "4.14" - type: olm.constraint value: failureMessage: Require Smart Gateway for Service Telemetry Framework