diff --git a/Dockerfile b/Dockerfile index a636d35c..5b5ba63f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest ARG USER_ID=65532 ARG GROUP_ID=65532 -ARG VERSION_LABEL=1.3.2 +ARG VERSION_LABEL=1.3.3 ARG RELEASE_LABEL=XX ARG VCS_REF=0123456789012345678901234567890123456789 ARG VCS_URL="https://github.com/application-stacks/runtime-component-operator" diff --git a/Makefile b/Makefile index 3fe76d05..3dce0b1c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 1.3.2 +VERSION ?= 1.3.3 OPERATOR_SDK_RELEASE_VERSION ?= v1.27.0 # CHANNELS define the bundle channels used in the bundle. diff --git a/bundle/manifests/runtime-component.clusterserviceversion.yaml b/bundle/manifests/runtime-component.clusterserviceversion.yaml index b9838cb4..fc89b739 100644 --- a/bundle/manifests/runtime-component.clusterserviceversion.yaml +++ b/bundle/manifests/runtime-component.clusterserviceversion.yaml @@ -11,7 +11,7 @@ metadata: "name": "runtimecomponent-sample" }, "spec": { - "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e", + "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91", "expose": true, "manageTLS": true, "replicas": 1, @@ -44,7 +44,7 @@ metadata: "name": "runtimecomponent-sample" }, "spec": { - "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e", + "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91", "expose": true, "replicas": 1, "service": { @@ -71,10 +71,16 @@ metadata: categories: Application Runtime certified: "true" containerImage: icr.io/appcafe/runtime-component-operator:daily - createdAt: "2024-07-11T19:05:26Z" + createdAt: "2024-08-01T20:26:42Z" description: Deploys any runtime component with dynamic and auto-tuning configuration - olm.skipRange: '>=0.8.0 <1.3.2' - operators.openshift.io/infrastructure-features: '["disconnected"]' + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" + olm.skipRange: '>=0.8.0 <1.3.3' operators.operatorframework.io/builder: operator-sdk-v1.27.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/application-stacks/runtime-component-operator @@ -84,7 +90,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: runtime-component.v1.3.2 + name: runtime-component.v1.3.3 namespace: placeholder spec: apiservicedefinitions: {} @@ -1012,7 +1018,7 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 - name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR value: icr.io/appcafe/runtime-component-operator:daily image: icr.io/appcafe/runtime-component-operator:daily @@ -1295,8 +1301,8 @@ spec: provider: name: Community relatedImages: - - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 name: liberty-sample-app - image: icr.io/appcafe/runtime-component-operator:daily name: runtime-component-operator - version: 1.3.2 + version: 1.3.3 diff --git a/catalog.Dockerfile b/catalog.Dockerfile index 1158d281..ea09a143 100644 --- a/catalog.Dockerfile +++ b/catalog.Dockerfile @@ -2,7 +2,7 @@ FROM registry.redhat.io/openshift4/ose-operator-registry:v4.14 AS builder FROM registry.redhat.io/ubi8/ubi-minimal # Add label for location of Declarative Config root directory & required OpenShift labels -ARG VERSION_LABEL=1.3.2 +ARG VERSION_LABEL=1.3.3 ARG RELEASE_LABEL=XX ARG VCS_REF=0123456789012345678901234567890123456789 ARG VCS_URL="https://github.com/application-stacks/runtime-component-operator" diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 0894650b..df36c220 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -67,7 +67,7 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 - name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR value: OPERATOR_IMAGE securityContext: diff --git a/config/manifests/bases/runtime-component.clusterserviceversion.yaml b/config/manifests/bases/runtime-component.clusterserviceversion.yaml index efcd850d..4795b258 100644 --- a/config/manifests/bases/runtime-component.clusterserviceversion.yaml +++ b/config/manifests/bases/runtime-component.clusterserviceversion.yaml @@ -9,8 +9,14 @@ metadata: containerImage: icr.io/appcafe/runtime-component-operator:daily createdAt: "2022-02-25T09:00:00Z" description: Deploys any runtime component with dynamic and auto-tuning configuration - olm.skipRange: '>=0.8.0 <1.3.2' - operators.openshift.io/infrastructure-features: '["disconnected"]' + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" + olm.skipRange: '>=0.8.0 <1.3.3' repository: https://github.com/application-stacks/runtime-component-operator support: Community labels: diff --git a/config/samples/rc.app.stacks_v1_runtimecomponent.yaml b/config/samples/rc.app.stacks_v1_runtimecomponent.yaml index 735a17ac..f078afe2 100644 --- a/config/samples/rc.app.stacks_v1_runtimecomponent.yaml +++ b/config/samples/rc.app.stacks_v1_runtimecomponent.yaml @@ -3,7 +3,7 @@ kind: RuntimeComponent metadata: name: runtimecomponent-sample spec: - applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 expose: true manageTLS: true replicas: 1 diff --git a/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml b/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml index 6a5d0970..ab06e1a5 100644 --- a/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml +++ b/config/samples/rc.app.stacks_v1beta2_runtimecomponent.yaml @@ -4,7 +4,7 @@ metadata: name: runtimecomponent-sample spec: # Add fields here - applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 expose: true replicas: 1 service: diff --git a/internal/deploy/kubectl/runtime-component-operator.yaml b/internal/deploy/kubectl/runtime-component-operator.yaml index 780d7424..5c200be4 100644 --- a/internal/deploy/kubectl/runtime-component-operator.yaml +++ b/internal/deploy/kubectl/runtime-component-operator.yaml @@ -302,7 +302,7 @@ spec: - name: WATCH_NAMESPACE value: RUNTIME_COMPONENT_WATCH_NAMESPACE - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 - name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR value: icr.io/appcafe/runtime-component-operator:daily image: icr.io/appcafe/runtime-component-operator:daily diff --git a/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml b/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml index d962913a..94ddc7a9 100644 --- a/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml +++ b/internal/deploy/kustomize/daily/base/runtime-component-operator.yaml @@ -50,7 +50,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:fd04ce5a5870387a379b54da5c47d0338c5f4a1254611d2418f1f959d018ba7e + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:422a7a00edc338497c0a91890b09204b8505ef0e377bb9b5944ace0102055e91 - name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR value: icr.io/appcafe/runtime-component-operator:daily image: icr.io/appcafe/runtime-component-operator:daily diff --git a/utils/utils.go b/utils/utils.go index 4d2dbbf6..487af9f8 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -41,7 +41,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -const RCOOperandVersion = "1.3.2" +const RCOOperandVersion = "1.3.3" var APIVersionNotFoundError = errors.New("APIVersion is not available")