From e6825fec7815195f72523734160552aced5accfe Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 28 Mar 2024 10:54:49 +0100 Subject: [PATCH] chore: update and remove env specific values files --- .../argocd-app-templates/appsetup-beta.yaml | 38 -------- .../argocd-app-templates/appsetup-int.yaml | 2 +- .../argocd-app-templates/appsetup-pen.yaml | 38 -------- .../argocd-app-templates/appsetup-rc.yaml | 38 -------- .../argocd-app-templates/appsetup-stable.yaml | 77 --------------- .../appsetup-upgrade.yaml | 38 -------- consortia/environments/values-beta.yaml | 84 ----------------- consortia/environments/values-dev.yaml | 6 +- consortia/environments/values-int.yaml | 6 +- consortia/environments/values-pen.yaml | 85 ----------------- consortia/environments/values-rc.yaml | 94 ------------------- 11 files changed, 7 insertions(+), 499 deletions(-) delete mode 100644 consortia/argocd-app-templates/appsetup-beta.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-pen.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-rc.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-stable.yaml delete mode 100644 consortia/argocd-app-templates/appsetup-upgrade.yaml delete mode 100644 consortia/environments/values-beta.yaml delete mode 100644 consortia/environments/values-pen.yaml delete mode 100644 consortia/environments/values-rc.yaml diff --git a/consortia/argocd-app-templates/appsetup-beta.yaml b/consortia/argocd-app-templates/appsetup-beta.yaml deleted file mode 100644 index a0b5f55..0000000 --- a/consortia/argocd-app-templates/appsetup-beta.yaml +++ /dev/null @@ -1,38 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim -spec: - destination: - namespace: product-portal - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/phil91/dim-client.git' - targetRevision: dim-1.0.0 - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-beta.yaml' - project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-int.yaml b/consortia/argocd-app-templates/appsetup-int.yaml index a6c7727..a38cff5 100644 --- a/consortia/argocd-app-templates/appsetup-int.yaml +++ b/consortia/argocd-app-templates/appsetup-int.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/dim repoURL: 'https://github.com/phil91/dim-client.git' - targetRevision: dim-1.0.0-rc.1 + targetRevision: dim-0.0.1 plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/appsetup-pen.yaml b/consortia/argocd-app-templates/appsetup-pen.yaml deleted file mode 100644 index c893cc5..0000000 --- a/consortia/argocd-app-templates/appsetup-pen.yaml +++ /dev/null @@ -1,38 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim-pen -spec: - destination: - namespace: product-portal-pen - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/phil91/dim-client.git' - targetRevision: dim-1.0.0-rc.1 - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-pen.yaml' - project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-rc.yaml b/consortia/argocd-app-templates/appsetup-rc.yaml deleted file mode 100644 index 3b59464..0000000 --- a/consortia/argocd-app-templates/appsetup-rc.yaml +++ /dev/null @@ -1,38 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim-rc -spec: - destination: - namespace: product-iam - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/phil91/dim-client.git' - targetRevision: release-candidate - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-rc.yaml' - project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-stable.yaml b/consortia/argocd-app-templates/appsetup-stable.yaml deleted file mode 100644 index 8214237..0000000 --- a/consortia/argocd-app-templates/appsetup-stable.yaml +++ /dev/null @@ -1,77 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim -spec: - destination: - name: '' - namespace: product-portal - server: 'https://kubernetes.default.svc' - source: - path: '' - repoURL: 'https://eclipse-tractusx.github.io/charts/dev' - targetRevision: dim-1.0.0-rc.1 - plugin: - env: - - name: HELM_VALUES - value: | - issuerBackendAddress: "https://dim.stable.demo.catena-x.net" - ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.stable.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim.stable.demo.catena-x.net" - hosts: - - host: "dim.stable.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - service: "dim-service" - port: 8080 - migrations: - logging: - default: "Debug" - postgresql: - primary: - extendedConfiguration: | - max_connections = 200 - readReplicas: - extendedConfiguration: | - max_connections = 200 - secrets: - postgresql: - auth: - existingSecret: - postgrespassword: "" - password: "" - replicationPassword: "" - chart: dim - sources: [] - project: project-portal diff --git a/consortia/argocd-app-templates/appsetup-upgrade.yaml b/consortia/argocd-app-templates/appsetup-upgrade.yaml deleted file mode 100644 index f035c6f..0000000 --- a/consortia/argocd-app-templates/appsetup-upgrade.yaml +++ /dev/null @@ -1,38 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: dim -spec: - destination: - namespace: product-portal - server: 'https://kubernetes.default.svc' - source: - path: charts/dim - repoURL: 'https://github.com/phil91/dim.git' - targetRevision: dim-1.0.0 - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-upgrade.yaml' - project: project-portal diff --git a/consortia/environments/values-beta.yaml b/consortia/environments/values-beta.yaml deleted file mode 100644 index dc82a38..0000000 --- a/consortia/environments/values-beta.yaml +++ /dev/null @@ -1,84 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.beta.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim.beta.demo.catena-x.net" - hosts: - - host: "dim.beta.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - port: 8080 - -dim: - swaggerEnabled: true - rootDirectoryId: "27fee02a-e265-4cfc-af70-4f217a33840b" - -migrations: - logging: - default: "Debug" - -processesworker: - logging: - default: "Debug" - dim: - adminMail: "phil.schneider@digitalnativesolutions.de" - clientIdCisCentral: "" - authUrl: "https://catena-x-int-dim.authentication.eu10.hana.ondemand.com" - subaccount: - # -- Url to the subaccount service api - baseUrl: "https://accounts-service.cfapps.eu10.hana.ondemand.com" - entitlement: - # -- Url to the entitlement service api - baseUrl: "https://entitlements-service.cfapps.eu10.hana.ondemand.com" - cf: - clientId: "" - clientSecret: "" - tokenAddress: "https://login.cf.eu10.hana.ondemand.com/oauth/token" - # -- Url to the cf service api - baseUrl: "https://api.cf.eu10.hana.ondemand.com" - grantType: "client_credentials" - callback: - scope: "openid" - grantType: "client_credentials" - # -- Provide client-id for callback. - clientId: "" - # -- Client-secret for callback client-id. Secret-key 'callback-client-secret'. - clientSecret: "" - tokenAddress: "http://centralidp.dev.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - # -- Url to the cf service api - baseAddress: "https://portal-backend.beta.demo.catena-x.net/api/administration/registration/dim/" - -postgresql: - auth: - postgrespassword: "" - password: "" - replicationPassword: "" diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml index a6f5f13..ffc131a 100644 --- a/consortia/environments/values-dev.yaml +++ b/consortia/environments/values-dev.yaml @@ -88,6 +88,6 @@ processesworker: postgresql: auth: - postgrespassword: "" - password: "" - replicationPassword: "" + postgrespassword: "" + password: "" + replicationPassword: "" diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml index b92f959..2473193 100644 --- a/consortia/environments/values-int.yaml +++ b/consortia/environments/values-int.yaml @@ -79,6 +79,6 @@ processesworker: postgresql: auth: - postgrespassword: "" - password: "" - replicationPassword: "" + postgrespassword: "" + password: "" + replicationPassword: "" diff --git a/consortia/environments/values-pen.yaml b/consortia/environments/values-pen.yaml deleted file mode 100644 index 8c90184..0000000 --- a/consortia/environments/values-pen.yaml +++ /dev/null @@ -1,85 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.dev.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim-backend-pen.dev.demo.catena-x.net" - hosts: - - host: "dim-backend-pen.dev.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - port: 8080 - -dim: - swaggerEnabled: true - rootDirectoryId: "27fee02a-e265-4cfc-af70-4f217a33840b" - -migrations: - logging: - default: "Debug" - -processesworker: - logging: - default: "Debug" - dim: - adminMail: "phil.schneider@digitalnativesolutions.de" - clientIdCisCentral: "" - authUrl: "https://catena-x-int-dim.authentication.eu10.hana.ondemand.com" - subaccount: - # -- Url to the subaccount service api - baseUrl: "https://accounts-service.cfapps.eu10.hana.ondemand.com" - entitlement: - # -- Url to the entitlement service api - baseUrl: "https://entitlements-service.cfapps.eu10.hana.ondemand.com" - cf: - clientId: "" - clientSecret: "" - tokenAddress: "https://login.cf.eu10.hana.ondemand.com/oauth/token" - # -- Url to the cf service api - baseUrl: "https://api.cf.eu10.hana.ondemand.com" - grantType: "client_credentials" - callback: - scope: "openid" - grantType: "client_credentials" - # -- Provide client-id for callback. - clientId: "" - # -- Client-secret for callback client-id. Secret-key 'callback-client-secret'. - clientSecret: "" - tokenAddress: "http://centralidp.dev.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - # -- Url to the cf service api - baseAddress: "https://portal-backend-pen.dev.demo.catena-x.net/api/administration/registration/dim/" - - -postgresql: - auth: - postgrespassword: "" - password: "" - replicationPassword: "" diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml deleted file mode 100644 index e96e4a8..0000000 --- a/consortia/environments/values-rc.yaml +++ /dev/null @@ -1,94 +0,0 @@ -############################################################### -# Copyright (c) 2024 BMW Group AG -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -############################################################### - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/proxy-body-size: "8m" - nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000, https://*.dev.demo.catena-x.net" - tls: - - secretName: "tls-secret" - hosts: - - "dim-backend-rc.dev.demo.catena-x.net" - hosts: - - host: "dim-backend-rc.dev.demo.catena-x.net" - paths: - - path: "/api/dim" - pathType: "Prefix" - backend: - port: 8080 - -dim: - image: - tag: "rc" - imagePullPolicy: "Always" - swaggerEnabled: true - rootDirectoryId: "27fee02a-e265-4cfc-af70-4f217a33840b" - -migrations: - image: - tag: "rc" - imagePullPolicy: "Always" - logging: - default: "Debug" - -processesworker: - image: - tag: "rc" - imagePullPolicy: "Always" - logging: - default: "Debug" - dim: - adminMail: "phil.schneider@digitalnativesolutions.de" - clientIdCisCentral: "" - authUrl: "https://catena-x-int-dim.authentication.eu10.hana.ondemand.com" - subaccount: - # -- Url to the subaccount service api - baseUrl: "https://accounts-service.cfapps.eu10.hana.ondemand.com" - entitlement: - # -- Url to the entitlement service api - baseUrl: "https://entitlements-service.cfapps.eu10.hana.ondemand.com" - cf: - clientId: "" - clientSecret: "" - tokenAddress: "https://login.cf.eu10.hana.ondemand.com/oauth/token" - # -- Url to the cf service api - baseUrl: "https://api.cf.eu10.hana.ondemand.com" - grantType: "client_credentials" - callback: - scope: "openid" - grantType: "client_credentials" - # -- Provide client-id for callback. - clientId: "" - # -- Client-secret for callback client-id. Secret-key 'callback-client-secret'. - clientSecret: "" - tokenAddress: "http://centralidp-rc.dev.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token" - # -- Url to the cf service api - baseAddress: "https://portal-backend-rc.dev.demo.catena-x.net/api/administration/registration/dim/" - - -postgresql: - auth: - postgrespassword: "" - password: "" - replicationPassword: ""