Skip to content

Commit

Permalink
Merge pull request #302 from catenax-ng/feature/update-dev-registry-c…
Browse files Browse the repository at this point in the history
…harts

Feature/update dev registry charts
  • Loading branch information
ds-jhartmann authored May 5, 2023
2 parents 87e1bd1 + 0442235 commit 8b6f478
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 320 deletions.
13 changes: 6 additions & 7 deletions charts/connector/aasregistry/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
###############################################################

apiVersion: v2
name: registry
name: digital-twin-registry
description: A Helm chart for Kubernetes

type: application
version: 0.1.0
appVersion: 0.0.1-M1
version: 0.0.1
appVersion: 0.0.1

dependencies:
- repository: https://charts.bitnami.com/bitnami
name: postgresql
version: 11.6.25
condition: enablePostgres
- name: registry
version: 0.2.14
repository: https://eclipse-tractusx.github.io/charts/dev
Empty file.
8 changes: 0 additions & 8 deletions charts/connector/aasregistry/templates/dockerconfigjson.yaml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

22 changes: 4 additions & 18 deletions charts/connector/aasregistry/values-esr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,8 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################

enablePostgres: true

registry:
ingress:
hosts:
- host: "irs-aas-registry-esr.dev.demo.catena-x.net"
paths:
- path: /
pathType: ImplementationSpecific
enabled: true
tls:
- hosts:
- "irs-aas-registry-esr.dev.demo.catena-x.net"
# Default secret for certificate creation already provided to your namespace
secretName: tls-secret
className: nginx
annotations:
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
registry:
authentication: false
idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central
host: irs-aas-registry-esr.dev.demo.catena-x.net
22 changes: 4 additions & 18 deletions charts/connector/aasregistry/values-ess.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,8 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################

enablePostgres: true

registry:
ingress:
hosts:
- host: "irs-aas-registry-ess.int.demo.catena-x.net"
paths:
- path: /
pathType: ImplementationSpecific
enabled: true
tls:
- hosts:
- "irs-aas-registry-ess.int.demo.catena-x.net"
# Default secret for certificate creation already provided to your namespace
secretName: tls-secret
className: nginx
annotations:
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
registry:
authentication: false
idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central
host: irs-aas-registry-ess.int.demo.catena-x.net
89 changes: 31 additions & 58 deletions charts/connector/aasregistry/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,67 +18,40 @@
# SPDX-License-Identifier: Apache-2.0
###############################################################

enablePostgres: true

registry:
image: ghcr.io/catenax-ng/registry@sha256:d171ff49f5daa77631829915f3f02a6ffa2ce05995df1d604ea808d8f3ba55ed
replicaCount: 1
imagePullPolicy: IfNotPresent
imagePullSecrets:
- name: dockerpullsecret
containerPort: 4243
host: irs-aas-registry.dev.demo.catena-x.net
## If 'authentication' is set to false, no OAuth authentication is enforced
authentication: false
idpIssuerUri: <path:traceability-irs/data/dev/aasregistry#idpIssuerUri>
service:
port: 8080
type: ClusterIP
dataSource:
driverClassName: org.postgresql.Driver
sqlInitPlatform: pg
## The url, user, and password parameter will be ignored if 'enablePostgres' is set to true.
## In that case the postgresql auth parameters are used.
url: jdbc:postgresql://database:5432
user: user
password: password
ingress:
hosts:
- host: "irs-aas-registry.dev.demo.catena-x.net"
paths:
- path: /
pathType: ImplementationSpecific
enabled: true
tls:
- hosts:
- "irs-aas-registry.dev.demo.catena-x.net"
# Default secret for certificate creation already provided to your namespace
secretName: tls-secret
className: nginx
annotations:
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
resources:
limits:
cpu: 750m
memory: "1024Mi"
requests:
cpu: 250m
memory: "512Mi"
enableKeycloak: false
postgresql:
primary:
persistence:
enabled: true
size: 1Gi
resources:
limits:
cpu: 750m
memory: 1Gi
requests:
cpu: 250m
memory: 512Mi

postgresql:
primary:
persistence:
registry:
authentication: false
idpIssuerUri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central
host: irs-aas-registry.dev.demo.catena-x.net
ingress:
enabled: true
size: 1Gi
tls: true
className: nginx
annotations:
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$2
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/x-forwarded-prefix: /semantics/registry

resources:
limits:
memory: 768Mi
cpu: 750m
service:
ports:
postgresql: 5432
auth:
username: <path:traceability-irs/data/dev/aasregistry#username>
password: <path:traceability-irs/data/dev/aasregistry#password>
database: registry
memory: 1Gi
requests:
cpu: 250m
memory: 512Mi
Loading

0 comments on commit 8b6f478

Please sign in to comment.