From becf646d462ad422cd37665bd7c6a66c9da16000 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Fri, 20 Sep 2024 15:11:31 -0400 Subject: [PATCH] Update getting-started sample + DNS entries update (#626) * Update getting-started sample Signed-off-by: Leo Christy Jesuraj * Update RCO module Signed-off-by: Leo Christy Jesuraj --------- 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 +- go.mod | 2 +- go.sum | 4 ++-- internal/deploy/kubectl/openliberty-app-operator.yaml | 2 +- .../kustomize/daily/base/open-liberty-operator.yaml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bundle/manifests/open-liberty.clusterserviceversion.yaml b/bundle/manifests/open-liberty.clusterserviceversion.yaml index 37d8028e4..8008c9070 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:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7", + "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650", "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:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7", + "applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650", "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-09-16T15:38:08Z" + createdAt: "2024-09-20T19:04:14Z" description: Deploy and manage containerized Liberty applications features.operators.openshift.io/disconnected: "true" features.operators.openshift.io/fips-compliant: "true" @@ -1151,7 +1151,7 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 - name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR value: icr.io/appcafe/open-liberty-operator:daily image: icr.io/appcafe/open-liberty-operator:daily @@ -1458,7 +1458,7 @@ spec: provider: name: IBM relatedImages: - - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + - image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 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 1a99aacd8..4b2256e93 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -70,7 +70,7 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_LIBERTY_SAMPLE_APP - value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 - 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 b78904e89..36831c986 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:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 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 e706e5f07..c1fde3c39 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:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + applicationImage: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 expose: true replicas: 1 service: diff --git a/go.mod b/go.mod index 0468517d1..042bc2346 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/OpenLiberty/open-liberty-operator go 1.23 require ( - github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240918145808-74c596c22d88 + github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240920184731-58836ec570f6 github.com/cert-manager/cert-manager v1.13.6 github.com/go-logr/logr v1.3.0 github.com/openshift/api v0.0.0-20230928134114-673ed0cfc7f1 diff --git a/go.sum b/go.sum index 30f41624e..7d27cc479 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= -github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240918145808-74c596c22d88 h1:BeJTSuOUKwz6QQXTbsMtVQN661uACWiMz5RVuFxMe3Y= -github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240918145808-74c596c22d88/go.mod h1:Q//a3yubxjR3+COorasymYRuuiDPs0Usgl9YuADkD6U= +github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240920184731-58836ec570f6 h1:ltEk49dxle0XgNgVSGWspfBqcx2nkd1SBMLoWOD1ETA= +github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20240920184731-58836ec570f6/go.mod h1:Q//a3yubxjR3+COorasymYRuuiDPs0Usgl9YuADkD6U= 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/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/internal/deploy/kubectl/openliberty-app-operator.yaml b/internal/deploy/kubectl/openliberty-app-operator.yaml index 650146299..13a6425d6 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:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 - 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 db4d2a92f..9b835ba52 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:91589e8e215d416595b045c739724385ffe34364df06d36794dca0d6964053e7 + value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:3999aa86f788e601d305896e48a043a91861cdbf71951a1959887151390b3650 - name: RELATED_IMAGE_OPEN_LIBERTY_OPERATOR value: icr.io/appcafe/open-liberty-operator:daily image: icr.io/appcafe/open-liberty-operator:daily