From 4a6f36be6af60dfdacf4f0533fb714ed3254006f Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Thu, 1 Aug 2024 14:47:18 -0400 Subject: [PATCH 1/4] Update RCO to use targetPort with network policy Signed-off-by: Leo Christy Jesuraj --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b06141ad2..66074963a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/OpenLiberty/open-liberty-operator go 1.22 require ( - github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240711175518-f7c22478a03c + github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240715223142-6577689c3b84 github.com/cert-manager/cert-manager v1.11.5 github.com/go-logr/logr v1.2.4 github.com/openshift/api v0.0.0-20230928134114-673ed0cfc7f1 diff --git a/go.sum b/go.sum index 5f92e9c24..580f8e051 100644 --- a/go.sum +++ b/go.sum @@ -39,10 +39,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240709193912-5bf349989171 h1:+6mXKupf/5t5MZqDMmYLNWUlYxp1lHJw2MKJe1GgdQs= -github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240709193912-5bf349989171/go.mod h1:WT5NclAsVyi4i74Iq+jQPSCDEB30wKhwc6mWEN74zeo= github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240711175518-f7c22478a03c h1:KlSE9/6ra/DXz1zOABEy/akRzyGs7C+k+hh+TNXGwIs= github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240711175518-f7c22478a03c/go.mod h1:WT5NclAsVyi4i74Iq+jQPSCDEB30wKhwc6mWEN74zeo= +github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240715223142-6577689c3b84 h1:jebDiz6LqH7V2PtaMJxM3BzNeGvZExK173KXfRSSVaA= +github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240715223142-6577689c3b84/go.mod h1:/4fxS8kw9t8W+JmZwtgKF130Ed/j8+OQ/ZYAPJbR3Ek= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= From 4aa9228337008c834b2e1ffdab6459913d66e4a7 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Thu, 1 Aug 2024 15:29:33 -0400 Subject: [PATCH 2/4] Update version to 1.3.3 Signed-off-by: Leo Christy Jesuraj --- Dockerfile | 2 +- Makefile | 2 +- bundle/manifests/open-liberty.clusterserviceversion.yaml | 8 ++++---- catalog.Dockerfile | 2 +- .../bases/open-liberty.clusterserviceversion.yaml | 2 +- go.sum | 2 -- utils/utils.go | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7551efff4..b47e091e5 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/OpenLiberty/open-liberty-operator" diff --git a/Makefile b/Makefile index 9e9872a9e..b4429a2c7 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/open-liberty.clusterserviceversion.yaml b/bundle/manifests/open-liberty.clusterserviceversion.yaml index ea1537e9f..ea9f36e8a 100644 --- a/bundle/manifests/open-liberty.clusterserviceversion.yaml +++ b/bundle/manifests/open-liberty.clusterserviceversion.yaml @@ -92,9 +92,9 @@ metadata: categories: Application Runtime certified: "true" containerImage: icr.io/appcafe/open-liberty-operator:daily - createdAt: "2024-07-11T19:18:53Z" + createdAt: "2024-08-01T19:28:05Z" description: Deploy and manage containerized Liberty applications - olm.skipRange: '>=0.8.0 <1.3.2' + olm.skipRange: '>=0.8.0 <1.3.3' operators.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.27.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -105,7 +105,7 @@ metadata: operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported operatorframework.io/os.linux: supported - name: open-liberty.v1.3.2 + name: open-liberty.v1.3.3 namespace: placeholder spec: apiservicedefinitions: {} @@ -1433,4 +1433,4 @@ spec: name: liberty-sample-app - image: icr.io/appcafe/open-liberty-operator:daily name: open-liberty-operator - version: 1.3.2 + version: 1.3.3 diff --git a/catalog.Dockerfile b/catalog.Dockerfile index 7eff17ce3..3979fc41e 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/OpenLiberty/open-liberty-operator" diff --git a/config/manifests/bases/open-liberty.clusterserviceversion.yaml b/config/manifests/bases/open-liberty.clusterserviceversion.yaml index d7c9af344..e5766ec91 100644 --- a/config/manifests/bases/open-liberty.clusterserviceversion.yaml +++ b/config/manifests/bases/open-liberty.clusterserviceversion.yaml @@ -8,7 +8,7 @@ metadata: certified: "true" createdAt: "2022-03-01T09:00:00Z" description: Deploy and manage containerized Liberty applications - olm.skipRange: '>=0.8.0 <1.3.2' + olm.skipRange: '>=0.8.0 <1.3.3' operators.openshift.io/infrastructure-features: '["disconnected"]' repository: https://github.com/OpenLiberty/open-liberty-operator support: IBM diff --git a/go.sum b/go.sum index 580f8e051..65a406378 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240711175518-f7c22478a03c h1:KlSE9/6ra/DXz1zOABEy/akRzyGs7C+k+hh+TNXGwIs= -github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240711175518-f7c22478a03c/go.mod h1:WT5NclAsVyi4i74Iq+jQPSCDEB30wKhwc6mWEN74zeo= github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240715223142-6577689c3b84 h1:jebDiz6LqH7V2PtaMJxM3BzNeGvZExK173KXfRSSVaA= github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240715223142-6577689c3b84/go.mod h1:/4fxS8kw9t8W+JmZwtgKF130Ed/j8+OQ/ZYAPJbR3Ek= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= diff --git a/utils/utils.go b/utils/utils.go index 427f45f11..c900b8f30 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -34,7 +34,7 @@ var log = logf.Log.WithName("openliberty_utils") // Constant Values const serviceabilityMountPath = "/serviceability" const ssoEnvVarPrefix = "SEC_SSO_" -const OperandVersion = "1.3.2" +const OperandVersion = "1.3.3" const ltpaKeysMountPath = "/config/managedLTPA" const ltpaServerXMLOverridesMountPath = "/config/configDropins/overrides/" const LTPAServerXMLSuffix = "-managed-ltpa-server-xml" From 6437d51010a0c0d89c47a341a370ce4356ac9b89 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Thu, 1 Aug 2024 15:59:12 -0400 Subject: [PATCH 3/4] Update getting-started sample image Signed-off-by: Leo Christy Jesuraj --- .../manifests/open-liberty.clusterserviceversion.yaml | 10 +++++----- config/manager/manager.yaml | 2 +- ...apps.openliberty.io_v1_openlibertyapplications.yaml | 2 +- ...openliberty.io_v1beta2_openlibertyapplications.yaml | 2 +- internal/deploy/kubectl/openliberty-app-operator.yaml | 2 +- .../kustomize/daily/base/open-liberty-operator.yaml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bundle/manifests/open-liberty.clusterserviceversion.yaml b/bundle/manifests/open-liberty.clusterserviceversion.yaml index ea9f36e8a..172dc9d67 100644 --- a/bundle/manifests/open-liberty.clusterserviceversion.yaml +++ b/bundle/manifests/open-liberty.clusterserviceversion.yaml @@ -11,7 +11,7 @@ metadata: "name": "openliberty-app-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, @@ -53,7 +53,7 @@ metadata: "name": "openliberty-app-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": { @@ -92,7 +92,7 @@ metadata: categories: Application Runtime certified: "true" containerImage: icr.io/appcafe/open-liberty-operator:daily - createdAt: "2024-08-01T19:28:05Z" + createdAt: "2024-08-01T19:57:02Z" description: Deploy and manage containerized Liberty applications olm.skipRange: '>=0.8.0 <1.3.3' operators.openshift.io/infrastructure-features: '["disconnected"]' @@ -1126,7 +1126,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_OPEN_LIBERTY_OPERATOR value: icr.io/appcafe/open-liberty-operator:daily image: icr.io/appcafe/open-liberty-operator:daily @@ -1429,7 +1429,7 @@ spec: provider: name: IBM 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/open-liberty-operator:daily name: open-liberty-operator diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 61a82a062..ca58b57dd 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -68,7 +68,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_OPEN_LIBERTY_OPERATOR value: OPERATOR_IMAGE securityContext: diff --git a/config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml b/config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml index 4d0cab009..12ecea740 100644 --- a/config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml +++ b/config/samples/apps.openliberty.io_v1_openlibertyapplications.yaml @@ -3,7 +3,7 @@ kind: OpenLibertyApplication metadata: name: openliberty-app-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/apps.openliberty.io_v1beta2_openlibertyapplications.yaml b/config/samples/apps.openliberty.io_v1beta2_openlibertyapplications.yaml index 7614cc666..5235289f6 100644 --- a/config/samples/apps.openliberty.io_v1beta2_openlibertyapplications.yaml +++ b/config/samples/apps.openliberty.io_v1beta2_openlibertyapplications.yaml @@ -4,7 +4,7 @@ metadata: name: openliberty-app-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/openliberty-app-operator.yaml b/internal/deploy/kubectl/openliberty-app-operator.yaml index ad8294129..a66478213 100644 --- a/internal/deploy/kubectl/openliberty-app-operator.yaml +++ b/internal/deploy/kubectl/openliberty-app-operator.yaml @@ -322,7 +322,7 @@ spec: - name: WATCH_NAMESPACE value: OPEN_LIBERTY_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_OPEN_LIBERTY_OPERATOR value: icr.io/appcafe/open-liberty-operator:daily image: icr.io/appcafe/open-liberty-operator:daily diff --git a/internal/deploy/kustomize/daily/base/open-liberty-operator.yaml b/internal/deploy/kustomize/daily/base/open-liberty-operator.yaml index f90b550fc..eb6148c83 100644 --- a/internal/deploy/kustomize/daily/base/open-liberty-operator.yaml +++ b/internal/deploy/kustomize/daily/base/open-liberty-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_OPEN_LIBERTY_OPERATOR value: icr.io/appcafe/open-liberty-operator:daily image: icr.io/appcafe/open-liberty-operator:daily From e0f00ce7dc91ce4fac670ba9146502a7f6919605 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Thu, 1 Aug 2024 16:22:23 -0400 Subject: [PATCH 4/4] Add annotations required for RH certified pipeline Signed-off-by: Leo Christy Jesuraj --- .../manifests/open-liberty.clusterserviceversion.yaml | 10 ++++++++-- .../bases/open-liberty.clusterserviceversion.yaml | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bundle/manifests/open-liberty.clusterserviceversion.yaml b/bundle/manifests/open-liberty.clusterserviceversion.yaml index 172dc9d67..ca32b9721 100644 --- a/bundle/manifests/open-liberty.clusterserviceversion.yaml +++ b/bundle/manifests/open-liberty.clusterserviceversion.yaml @@ -92,10 +92,16 @@ metadata: categories: Application Runtime certified: "true" containerImage: icr.io/appcafe/open-liberty-operator:daily - createdAt: "2024-08-01T19:57:02Z" + createdAt: "2024-08-01T20:19:13Z" description: Deploy and manage containerized Liberty applications + 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.openshift.io/infrastructure-features: '["disconnected"]' operators.operatorframework.io/builder: operator-sdk-v1.27.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/OpenLiberty/open-liberty-operator diff --git a/config/manifests/bases/open-liberty.clusterserviceversion.yaml b/config/manifests/bases/open-liberty.clusterserviceversion.yaml index e5766ec91..ce44c6a08 100644 --- a/config/manifests/bases/open-liberty.clusterserviceversion.yaml +++ b/config/manifests/bases/open-liberty.clusterserviceversion.yaml @@ -8,8 +8,14 @@ metadata: certified: "true" createdAt: "2022-03-01T09:00:00Z" description: Deploy and manage containerized Liberty applications + 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.openshift.io/infrastructure-features: '["disconnected"]' repository: https://github.com/OpenLiberty/open-liberty-operator support: IBM labels: