From 01c03fec7f737aaff1f3b23a6e9587e06602b4c8 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 4 Mar 2024 20:12:37 +0100 Subject: [PATCH 1/4] docs: add link to portal-iam-seeding docker notice --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a6ae7e70..fdbc6363 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,13 @@ For further information please refer to the chart specific README files, availab ## Notice for Docker images -This application provides container images (init containers only) for demonstration purposes. +This application provides container images for demonstration purposes. See Docker notice files for more information: * [portal-iam](./docker/notice-iam.md) * [portal-iam-consortia](./docker/notice-iam-consortia.md) +* [portal-iam-seeding](https://github.com/eclipse-tractusx/portal-backend/blob/main/docker/notice-iam-seeding.md) ## License From 6da500ea02d33f8ab7e399de7a43f757668907d6 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 4 Mar 2024 20:40:01 +0100 Subject: [PATCH 2/4] chore(v2.1.0): update changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eeeeaa56..bfa187fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel * assigned the role "configure_partner_registration" from the Cl2-CX-Portal client to the composite role "Registration External" of the client technical_roles_management * assigned the role "view_managed_idp" from the Cl2-CX-Portal client to the composite role "CX Admin" of the client Cl2-CX-Portal * added (docker.io) container registry to images +* seeding job for upgrade (centralidp): + * set resource requests + * changed to imagePullPolicy "IfNotPresent" + * enabled unique resource name ### Bugfix @@ -48,15 +52,20 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel * view_use_case_participation * view_certificates * removed username mapper from CX-Operator identity provider +* seeding job for upgrade (centralidp): fixed Keyclaok service name not being found in the case of nameOverride or fullnameOverride ### Technical Support * build of init containers + * TRG-7.05: added legal documentation * enabled build of images for arm64, in addition to amd64 * added additional image tags of type semver * updated base image versions for init container in README * updated generic-security documentation * adjusted source url in license files for static content +* introduceed CodeQL scan +* changed portal-cd references to portal due to repository renaming +* updated documentation ### Known Knowns From 965fb6c919a3137af63ce647fdc5d226368b961a Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Mon, 4 Mar 2024 20:47:04 +0100 Subject: [PATCH 3/4] build(2.1.0): bump version --- charts/centralidp/Chart.yaml | 2 +- charts/centralidp/values.yaml | 6 +++--- charts/sharedidp/Chart.yaml | 2 +- charts/sharedidp/values.yaml | 2 +- .../argocd-app-templates/centralidp/appsetup-beta.yaml | 2 +- consortia/argocd-app-templates/centralidp/appsetup-int.yaml | 2 +- consortia/argocd-app-templates/centralidp/appsetup-pen.yaml | 2 +- consortia/argocd-app-templates/centralidp/appsetup-rc.yaml | 2 +- .../argocd-app-templates/centralidp/appsetup-stable.yaml | 6 +++--- .../centralidp/appsetup-templateconsortia.yaml | 2 +- .../centralidp/appsetup-templategeneric.yaml | 2 +- .../argocd-app-templates/centralidp/appsetup-upgrade.yaml | 2 +- consortia/argocd-app-templates/sharedidp/appsetup-beta.yaml | 2 +- consortia/argocd-app-templates/sharedidp/appsetup-int.yaml | 2 +- consortia/argocd-app-templates/sharedidp/appsetup-pen.yaml | 2 +- consortia/argocd-app-templates/sharedidp/appsetup-rc.yaml | 2 +- .../argocd-app-templates/sharedidp/appsetup-stable.yaml | 4 ++-- .../sharedidp/appsetup-templateconsortia.yaml | 2 +- .../sharedidp/appsetup-templategeneric.yaml | 2 +- .../argocd-app-templates/sharedidp/appsetup-upgrade.yaml | 2 +- consortia/environments/centralidp/values-beta.yaml | 4 ++-- consortia/environments/centralidp/values-int.yaml | 4 ++-- consortia/environments/centralidp/values-pen.yaml | 4 ++-- consortia/environments/centralidp/values-rc.yaml | 4 ++-- .../environments/centralidp/values-templateconsortia.yaml | 6 +++--- .../environments/centralidp/values-templategeneric.yaml | 6 +++--- consortia/environments/sharedidp/values-beta.yaml | 2 +- consortia/environments/sharedidp/values-int.yaml | 2 +- consortia/environments/sharedidp/values-pen.yaml | 2 +- consortia/environments/sharedidp/values-rc.yaml | 2 +- .../environments/sharedidp/values-templateconsortia.yaml | 2 +- .../environments/sharedidp/values-templategeneric.yaml | 2 +- 32 files changed, 45 insertions(+), 45 deletions(-) diff --git a/charts/centralidp/Chart.yaml b/charts/centralidp/Chart.yaml index 96e21ff7..ed99e031 100644 --- a/charts/centralidp/Chart.yaml +++ b/charts/centralidp/Chart.yaml @@ -20,7 +20,7 @@ apiVersion: v2 name: centralidp type: application -version: 2.1.0-RC1 +version: 2.1.0 appVersion: 22.0.3 description: Helm chart for Catena-X Central Keycloak Instance home: https://github.com/eclipse-tractusx/portal-iam diff --git a/charts/centralidp/values.yaml b/charts/centralidp/values.yaml index a0da09da..27869f26 100644 --- a/charts/centralidp/values.yaml +++ b/charts/centralidp/values.yaml @@ -48,7 +48,7 @@ keycloak: mountPath: "/realms" initContainers: - name: import - image: docker.io/tractusx/portal-iam:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam:v2.1.0 imagePullPolicy: Always command: - sh @@ -149,7 +149,7 @@ seeding: # Please also refer to the 'Post-Upgrade Configuration' section in the README.md # for configuration possibly not covered by the seeding job enabled: false - image: "docker.io/tractusx/portal-iam-seeding:v2.1.0-iam-RC1" + image: "docker.io/tractusx/portal-iam-seeding:v2.1.0-iam" imagePullPolicy: "IfNotPresent" portContainer: 8080 authRealm: "master" @@ -177,7 +177,7 @@ seeding: mountPath: "app/realms" initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam:v2.1.0 imagePullPolicy: IfNotPresent command: - sh diff --git a/charts/sharedidp/Chart.yaml b/charts/sharedidp/Chart.yaml index f6668b5f..c1ac6d09 100644 --- a/charts/sharedidp/Chart.yaml +++ b/charts/sharedidp/Chart.yaml @@ -20,7 +20,7 @@ apiVersion: v2 name: sharedidp type: application -version: 2.1.0-RC1 +version: 2.1.0 appVersion: 22.0.3 description: Helm chart for Catena-X Shared Keycloak Instance home: https://github.com/eclipse-tractusx/portal-iam diff --git a/charts/sharedidp/values.yaml b/charts/sharedidp/values.yaml index b5aa738a..581488ac 100644 --- a/charts/sharedidp/values.yaml +++ b/charts/sharedidp/values.yaml @@ -52,7 +52,7 @@ keycloak: mountPath: "/realms" initContainers: - name: import - image: docker.io/tractusx/portal-iam:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/argocd-app-templates/centralidp/appsetup-beta.yaml b/consortia/argocd-app-templates/centralidp/appsetup-beta.yaml index 629d1b49..0eb74242 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-beta.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-beta.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/centralidp/appsetup-int.yaml b/consortia/argocd-app-templates/centralidp/appsetup-int.yaml index cad0c4f6..9757221f 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-int.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-int.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/centralidp/appsetup-pen.yaml b/consortia/argocd-app-templates/centralidp/appsetup-pen.yaml index ae013466..62cde58d 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-pen.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-pen.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/centralidp/appsetup-rc.yaml b/consortia/argocd-app-templates/centralidp/appsetup-rc.yaml index d69b1c7b..54ffa6f7 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-rc.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-rc.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/centralidp/appsetup-stable.yaml b/consortia/argocd-app-templates/centralidp/appsetup-stable.yaml index bcc15b12..715e5646 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-stable.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-stable.yaml @@ -29,7 +29,7 @@ spec: source: path: '' repoURL: 'https://eclipse-tractusx.github.io/charts/dev' - targetRevision: 2.1.0-RC1 + targetRevision: 2.1.0 plugin: env: - name: HELM_VALUES @@ -37,7 +37,7 @@ spec: keycloak: initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh @@ -83,7 +83,7 @@ spec: enabled: true initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/argocd-app-templates/centralidp/appsetup-templateconsortia.yaml b/consortia/argocd-app-templates/centralidp/appsetup-templateconsortia.yaml index db9297a0..cd0ef091 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-templateconsortia.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-templateconsortia.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/centralidp/appsetup-templategeneric.yaml b/consortia/argocd-app-templates/centralidp/appsetup-templategeneric.yaml index 01a01ca8..0f0808f3 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-templategeneric.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-templategeneric.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/centralidp/appsetup-upgrade.yaml b/consortia/argocd-app-templates/centralidp/appsetup-upgrade.yaml index 697b1630..f73ad63a 100644 --- a/consortia/argocd-app-templates/centralidp/appsetup-upgrade.yaml +++ b/consortia/argocd-app-templates/centralidp/appsetup-upgrade.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/centralidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-beta.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-beta.yaml index eed7863d..e4276233 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-beta.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-beta.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-int.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-int.yaml index 86a1a652..f607f44c 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-int.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-int.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-pen.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-pen.yaml index e0a8fd6d..0e5af4e3 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-pen.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-pen.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-rc.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-rc.yaml index f70b9c98..744fb6ef 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-rc.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-rc.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-stable.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-stable.yaml index 93f2ab40..cb9940be 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-stable.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-stable.yaml @@ -29,7 +29,7 @@ spec: source: path: '' repoURL: 'https://eclipse-tractusx.github.io/charts/dev' - targetRevision: 2.1.0-RC1 + targetRevision: 2.1.0 plugin: env: - name: HELM_VALUES @@ -56,7 +56,7 @@ spec: mountPath: "/secrets" initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-templateconsortia.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-templateconsortia.yaml index 2865dc42..2ebc809e 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-templateconsortia.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-templateconsortia.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-templategeneric.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-templategeneric.yaml index 1571c18f..f7b72444 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-templategeneric.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-templategeneric.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/sharedidp/appsetup-upgrade.yaml b/consortia/argocd-app-templates/sharedidp/appsetup-upgrade.yaml index 03b27d75..cbfbeb9e 100644 --- a/consortia/argocd-app-templates/sharedidp/appsetup-upgrade.yaml +++ b/consortia/argocd-app-templates/sharedidp/appsetup-upgrade.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/sharedidp repoURL: 'https://github.com/eclipse-tractusx/portal-iam.git' - targetRevision: v2.1.0-RC1 + targetRevision: v2.1.0 plugin: env: - name: AVP_SECRET diff --git a/consortia/environments/centralidp/values-beta.yaml b/consortia/environments/centralidp/values-beta.yaml index 3465a323..f05975f4 100644 --- a/consortia/environments/centralidp/values-beta.yaml +++ b/consortia/environments/centralidp/values-beta.yaml @@ -22,7 +22,7 @@ keycloak: proxy: edge initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh @@ -69,7 +69,7 @@ seeding: enabled: true initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/centralidp/values-int.yaml b/consortia/environments/centralidp/values-int.yaml index 71d36a22..aa861839 100644 --- a/consortia/environments/centralidp/values-int.yaml +++ b/consortia/environments/centralidp/values-int.yaml @@ -22,7 +22,7 @@ keycloak: proxy: edge initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh @@ -69,7 +69,7 @@ seeding: enabled: false initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/centralidp/values-pen.yaml b/consortia/environments/centralidp/values-pen.yaml index 2044ecd4..42f76cc6 100644 --- a/consortia/environments/centralidp/values-pen.yaml +++ b/consortia/environments/centralidp/values-pen.yaml @@ -22,7 +22,7 @@ keycloak: proxy: edge initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh @@ -69,7 +69,7 @@ seeding: enabled: true initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/centralidp/values-rc.yaml b/consortia/environments/centralidp/values-rc.yaml index 8b4423f2..b16de4da 100644 --- a/consortia/environments/centralidp/values-rc.yaml +++ b/consortia/environments/centralidp/values-rc.yaml @@ -22,7 +22,7 @@ keycloak: proxy: edge initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh @@ -69,7 +69,7 @@ seeding: enabled: true initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/centralidp/values-templateconsortia.yaml b/consortia/environments/centralidp/values-templateconsortia.yaml index f9943d53..3e6f5555 100644 --- a/consortia/environments/centralidp/values-templateconsortia.yaml +++ b/consortia/environments/centralidp/values-templateconsortia.yaml @@ -22,7 +22,7 @@ keycloak: proxy: edge initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh @@ -67,10 +67,10 @@ secrets: seeding: enabled: false - image: "docker.io/tractusx/portal-iam-seeding:v2.1.0-iam-RC1" + image: "docker.io/tractusx/portal-iam-seeding:v2.1.0-iam" initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/centralidp/values-templategeneric.yaml b/consortia/environments/centralidp/values-templategeneric.yaml index 8b1f8d04..791831b0 100644 --- a/consortia/environments/centralidp/values-templategeneric.yaml +++ b/consortia/environments/centralidp/values-templategeneric.yaml @@ -22,7 +22,7 @@ keycloak: proxy: edge initContainers: - name: import - image: docker.io/tractusx/portal-iam:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam:v2.1.0 imagePullPolicy: Always command: - sh @@ -67,10 +67,10 @@ secrets: seeding: enabled: true - image: "docker.io/tractusx/portal-iam-seeding:v2.1.0-iam-RC1" + image: "docker.io/tractusx/portal-iam-seeding:v2.1.0-iam" initContainers: - name: init-cx-central - image: docker.io/tractusx/portal-iam:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/sharedidp/values-beta.yaml b/consortia/environments/sharedidp/values-beta.yaml index 83b26f53..3e5b144e 100644 --- a/consortia/environments/sharedidp/values-beta.yaml +++ b/consortia/environments/sharedidp/values-beta.yaml @@ -41,7 +41,7 @@ keycloak: mountPath: "/secrets" initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/sharedidp/values-int.yaml b/consortia/environments/sharedidp/values-int.yaml index 65d6be76..227e8258 100644 --- a/consortia/environments/sharedidp/values-int.yaml +++ b/consortia/environments/sharedidp/values-int.yaml @@ -41,7 +41,7 @@ keycloak: mountPath: "/secrets" initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/sharedidp/values-pen.yaml b/consortia/environments/sharedidp/values-pen.yaml index c89fb058..cfe06d27 100644 --- a/consortia/environments/sharedidp/values-pen.yaml +++ b/consortia/environments/sharedidp/values-pen.yaml @@ -41,7 +41,7 @@ keycloak: mountPath: "/secrets" initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/sharedidp/values-rc.yaml b/consortia/environments/sharedidp/values-rc.yaml index 1aa48b15..0be6507f 100644 --- a/consortia/environments/sharedidp/values-rc.yaml +++ b/consortia/environments/sharedidp/values-rc.yaml @@ -41,7 +41,7 @@ keycloak: mountPath: "/secrets" initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/sharedidp/values-templateconsortia.yaml b/consortia/environments/sharedidp/values-templateconsortia.yaml index 46d9ef07..c4fae096 100644 --- a/consortia/environments/sharedidp/values-templateconsortia.yaml +++ b/consortia/environments/sharedidp/values-templateconsortia.yaml @@ -41,7 +41,7 @@ keycloak: mountPath: "/secrets" initContainers: - name: import - image: docker.io/tractusx/portal-iam-consortia:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam-consortia:v2.1.0 imagePullPolicy: Always command: - sh diff --git a/consortia/environments/sharedidp/values-templategeneric.yaml b/consortia/environments/sharedidp/values-templategeneric.yaml index 82fe01b3..f9cb255e 100644 --- a/consortia/environments/sharedidp/values-templategeneric.yaml +++ b/consortia/environments/sharedidp/values-templategeneric.yaml @@ -36,7 +36,7 @@ keycloak: mountPath: "/realms" initContainers: - name: import - image: docker.io/tractusx/portal-iam:v2.1.0-RC1 + image: docker.io/tractusx/portal-iam:v2.1.0 imagePullPolicy: Always command: - sh From b54959d8c0a7dae6db922e4756d857dac42fd8a0 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Tue, 5 Mar 2024 10:12:24 +0100 Subject: [PATCH 4/4] docs(v2.1.0): update chart readme files --- charts/centralidp/README.md | 26 +++++++++++++++++--------- charts/centralidp/README.md.gotmpl | 8 ++++++++ charts/sharedidp/README.md | 12 ++++++++---- charts/sharedidp/README.md.gotmpl | 4 ++++ 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/charts/centralidp/README.md b/charts/centralidp/README.md index 9d1e84f1..66fd608c 100644 --- a/charts/centralidp/README.md +++ b/charts/centralidp/README.md @@ -1,6 +1,6 @@ # Helm chart for Catena-X Central Keycloak Instance -![Version: 2.1.0-RC1](https://img.shields.io/badge/Version-2.1.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.3](https://img.shields.io/badge/AppVersion-22.0.3-informational?style=flat-square) +![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.3](https://img.shields.io/badge/AppVersion-22.0.3-informational?style=flat-square) This helm chart installs the Helm chart for Catena-X Central Keycloak Instance. @@ -29,7 +29,7 @@ To use the helm chart as a dependency: dependencies: - name: centralidp repository: https://eclipse-tractusx.github.io/charts/dev - version: 2.1.0-RC1 + version: 2.1.0 ``` ## Requirements @@ -59,7 +59,7 @@ dependencies: | keycloak.extraVolumeMounts[1].name | string | `"realms"` | | | keycloak.extraVolumeMounts[1].mountPath | string | `"/realms"` | | | keycloak.initContainers[0].name | string | `"import"` | | -| keycloak.initContainers[0].image | string | `"tractusx/portal-iam:v2.1.0-RC1"` | | +| keycloak.initContainers[0].image | string | `"docker.io/tractusx/portal-iam:v2.1.0"` | | | keycloak.initContainers[0].imagePullPolicy | string | `"Always"` | | | keycloak.initContainers[0].command[0] | string | `"sh"` | | | keycloak.initContainers[0].args[0] | string | `"-c"` | | @@ -87,7 +87,7 @@ dependencies: | keycloak.rbac.rules[0].resources[0] | string | `"pods"` | | | keycloak.rbac.rules[0].verbs[0] | string | `"get"` | | | keycloak.rbac.rules[0].verbs[1] | string | `"list"` | | -| keycloak.postgresql.enabled | bool | `true` | PostgreSQL chart configuration; default configurations: host: "centralidp-postgresql-primary", port: 5432; Switch to enable or disable the PostgreSQL helm chart. | +| keycloak.postgresql.enabled | bool | `true` | PostgreSQL chart configuration (recommended for demonstration purposes only); default configurations: host: "centralidp-postgresql-primary", port: 5432; Switch to enable or disable the PostgreSQL helm chart. | | keycloak.postgresql.auth.username | string | `"kccentral"` | Non-root username. | | keycloak.postgresql.auth.database | string | `"iamcentralidp"` | Database name. | | keycloak.postgresql.auth.existingSecret | string | `"centralidp-postgres"` | Secret containing the passwords for root usernames postgres and non-root username kccentral. | @@ -104,8 +104,8 @@ dependencies: | secrets.postgresql.auth.existingSecret.password | string | `""` | Password for the non-root username 'kccentral'. Secret-key 'password'. | | secrets.postgresql.auth.existingSecret.replicationPassword | string | `""` | Password for the non-root username 'repl_user'. Secret-key 'replication-password'. | | seeding.enabled | bool | `false` | Seeding job to upgrade CX_Central realm: enable to upgrade the configuration of the CX-Central realm from previous version; Please also refer to the 'Post-Upgrade Configuration' section in the README.md for configuration possibly not covered by the seeding job | -| seeding.name | string | `"cx-central-realm-upgrade"` | | -| seeding.image | string | `"tractusx/portal-iam-seeding:v2.1.0-iam-RC1"` | | +| seeding.image | string | `"docker.io/tractusx/portal-iam-seeding:v2.1.0-iam"` | | +| seeding.imagePullPolicy | string | `"IfNotPresent"` | | | seeding.portContainer | int | `8080` | | | seeding.authRealm | string | `"master"` | | | seeding.useAuthTrail | string | `"true"` | | @@ -113,14 +113,14 @@ dependencies: | seeding.instanceName | string | `"central"` | | | seeding.excludedUserAttributes.attribute0 | string | `"bpn"` | | | seeding.excludedUserAttributes.attribute1 | string | `"organisation"` | | -| seeding.resources | object | `{}` | We recommend not to specify default resources and to leave this as a conscious choice for the user. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after 'resources:'. | +| seeding.resources | object | `{"requests":{"cpu":"15m","memory":"105M"}}` | We recommend not to specify default resource limits and to leave this as a conscious choice for the user. If you do want to specify resource limits, uncomment the following lines and adjust them as necessary. | | seeding.extraVolumes[0].name | string | `"realms"` | | | seeding.extraVolumes[0].emptyDir | object | `{}` | | | seeding.extraVolumeMounts[0].name | string | `"realms"` | | | seeding.extraVolumeMounts[0].mountPath | string | `"app/realms"` | | | seeding.initContainers[0].name | string | `"init-cx-central"` | | -| seeding.initContainers[0].image | string | `"tractusx/portal-iam:v2.1.0-RC1"` | | -| seeding.initContainers[0].imagePullPolicy | string | `"Always"` | | +| seeding.initContainers[0].image | string | `"docker.io/tractusx/portal-iam:v2.1.0"` | | +| seeding.initContainers[0].imagePullPolicy | string | `"IfNotPresent"` | | | seeding.initContainers[0].command[0] | string | `"sh"` | | | seeding.initContainers[0].args[0] | string | `"-c"` | | | seeding.initContainers[0].args[1] | string | `"echo \"Copying CX Central realm...\"\ncp -R /import/catenax-central/realms/* /app/realms\n"` | | @@ -146,6 +146,10 @@ This is done by setting the 'example.org' placeholder in the CX-Operator' Identi Please see notes at [Values.seeding](values.yaml#L146) for upgrading the configuration of the CX-Central realm. +### To 2.1.0 + +No specific upgrade notes. + ### To 2.0.0 This major changes from Keycloak version 16.1.1 to version 22.0.3. @@ -276,3 +280,7 @@ As part of an optional housekeeping, the following clients are obsolete in versi * Cl6-CX-DAPS (was already obsolete with v1.2.0) * Cl20-CX-IRS * Cl16-CX-BPDMGate-Portal + +### Upgrading from version 2.0.0 to 2.1.0 + +By enabling the seeding (Values.seeding.enabled), the CX-Central realm is upgraded by a job defined as a post-upgrade hook. diff --git a/charts/centralidp/README.md.gotmpl b/charts/centralidp/README.md.gotmpl index e13cd96f..b86d0e82 100644 --- a/charts/centralidp/README.md.gotmpl +++ b/charts/centralidp/README.md.gotmpl @@ -55,6 +55,10 @@ This is done by setting the 'example.org' placeholder in the CX-Operator' Identi Please see notes at [Values.seeding](values.yaml#L146) for upgrading the configuration of the CX-Central realm. +### To 2.1.0 + +No specific upgrade notes. + ### To 2.0.0 This major changes from Keycloak version 16.1.1 to version 22.0.3. @@ -185,3 +189,7 @@ As part of an optional housekeeping, the following clients are obsolete in versi * Cl6-CX-DAPS (was already obsolete with v1.2.0) * Cl20-CX-IRS * Cl16-CX-BPDMGate-Portal + +### Upgrading from version 2.0.0 to 2.1.0 + +By enabling the seeding (Values.seeding.enabled), the CX-Central realm is upgraded by a job defined as a post-upgrade hook. diff --git a/charts/sharedidp/README.md b/charts/sharedidp/README.md index 6379e6c5..7e2da90f 100644 --- a/charts/sharedidp/README.md +++ b/charts/sharedidp/README.md @@ -1,6 +1,6 @@ # Helm chart for Catena-X Shared Keycloak Instance -![Version: 2.1.0-RC1](https://img.shields.io/badge/Version-2.1.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.3](https://img.shields.io/badge/AppVersion-22.0.3-informational?style=flat-square) +![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.3](https://img.shields.io/badge/AppVersion-22.0.3-informational?style=flat-square) This helm chart installs the Helm chart for Catena-X Shared Keycloak Instance. @@ -29,7 +29,7 @@ To use the helm chart as a dependency: dependencies: - name: sharedidp repository: https://eclipse-tractusx.github.io/charts/dev - version: 2.1.0-RC1 + version: 2.1.0 ``` ## Requirements @@ -63,7 +63,7 @@ dependencies: | keycloak.extraVolumeMounts[2].name | string | `"realms"` | | | keycloak.extraVolumeMounts[2].mountPath | string | `"/realms"` | | | keycloak.initContainers[0].name | string | `"import"` | | -| keycloak.initContainers[0].image | string | `"tractusx/portal-iam:v2.1.0-RC1"` | | +| keycloak.initContainers[0].image | string | `"docker.io/tractusx/portal-iam:v2.1.0"` | | | keycloak.initContainers[0].imagePullPolicy | string | `"Always"` | | | keycloak.initContainers[0].command[0] | string | `"sh"` | | | keycloak.initContainers[0].args[0] | string | `"-c"` | | @@ -93,7 +93,7 @@ dependencies: | keycloak.rbac.rules[0].resources[0] | string | `"pods"` | | | keycloak.rbac.rules[0].verbs[0] | string | `"get"` | | | keycloak.rbac.rules[0].verbs[1] | string | `"list"` | | -| keycloak.postgresql.enabled | bool | `true` | PostgreSQL chart configuration; default configurations: host: "sharedidp-postgresql-primary", port: 5432; Switch to enable or disable the PostgreSQL helm chart. | +| keycloak.postgresql.enabled | bool | `true` | PostgreSQL chart configuration (recommended for demonstration purposes only); default configurations: host: "sharedidp-postgresql-primary", port: 5432; Switch to enable or disable the PostgreSQL helm chart. | | keycloak.postgresql.auth.username | string | `"kcshared"` | Non-root username. | | keycloak.postgresql.auth.database | string | `"iamsharedidp"` | Database name. | | keycloak.postgresql.auth.existingSecret | string | `"sharedidp-postgres"` | Secret containing the passwords for root usernames postgres and non-root username kcshared. | @@ -136,6 +136,10 @@ Generate client-secrets for the service account with access type 'confidential'. ## Upgrade +### To 2.1.0 + +No specific upgrade notes. + ### To 2.0.0 This major changes from Keycloak version 16.1.1 to version 22.0.3. diff --git a/charts/sharedidp/README.md.gotmpl b/charts/sharedidp/README.md.gotmpl index d6b21c7e..902104a0 100644 --- a/charts/sharedidp/README.md.gotmpl +++ b/charts/sharedidp/README.md.gotmpl @@ -61,6 +61,10 @@ Generate client-secrets for the service account with access type 'confidential'. ## Upgrade +### To 2.1.0 + +No specific upgrade notes. + ### To 2.0.0 This major changes from Keycloak version 16.1.1 to version 22.0.3.