Skip to content

Commit

Permalink
installation modification
Browse files Browse the repository at this point in the history
  • Loading branch information
@adkumar1
adkumar1 committed Feb 29, 2024
1 parent 8ca6b01 commit 416fd23
Show file tree
Hide file tree
Showing 5 changed files with 164 additions and 74 deletions.
7 changes: 5 additions & 2 deletions INSTALL.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ How to install application using helm: <br />

Local installation:

1. Install Kubeapps on your local Kubernetes cluster
1. Install Kubeapps on your local Kubernetes cluster.
Installation for kubeapps can be taken from reference https://docs.bitnami.com/tutorials/install-use-kubeapps/

2. Add Package repository in Kubeapps https://eclipse-tractusx.github.io/charts/dev/

Expand All @@ -27,6 +28,8 @@ Local installation:

5. Select managed-service-orchestrator from the Catalog

6. Deploy it
6. To set your own configuration and secret values in values file

7. Deploy the application


2 changes: 1 addition & 1 deletion charts/orchestrator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ dependencies:
- condition: postgresql.enabled
name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 11.x.x
version: 12.x.x
19 changes: 16 additions & 3 deletions charts/orchestrator/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,25 @@ spec:
value: "3"
- name: RETRY_BACKOFFDELAY
value: "500"
- name: SPRING_DATASOURCE_USERNAME
value: {{ .Values.postgresql.auth.username | required ".Values.sdepostgresql.auth.username is required" | quote }}
{{- if .Values.postgresql.fullnameOverride }}
- name: SPRING_DATASOURCE_URL
value: "jdbc:postgresql://{{ .Values.postgresql.fullnameOverride }}:{{ .Values.postgresql.auth.port }}/{{ .Values.postgresql.auth.database }}"
- name: SPRING_DATASOURCE_USERNAME
value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
- name: SPRING_DATASOURCE_PASSWORD
value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote}}
valueFrom:
secretKeyRef:
name: {{ .Values.postgresql.fullnameOverride }}
key: "password"
{{- else }}
- name: SPRING_DATASOURCE_URL
value: "jdbc:postgresql://{{ include "managed-service-orchestrator.fullname" . }}-postgresql:{{ .Values.postgresql.auth.port }}/{{ .Values.postgresql.auth.database }}"
- name: SPRING_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "sde.fullname" . }}-postgresql
key: "password"
{{- end }}

resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
136 changes: 68 additions & 68 deletions charts/orchestrator/templates/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,74 +24,74 @@ type: Opaque
metadata:
name: {{ .Values.secretRef }}
stringData:
connectorTestServiceUrl: default
connectorregisterUrl: default
connectorregisterkeycloakclientId: default
connectorregisterkeycloakclientSecret: default
connectorregisterkeycloaktokenURI: default
dapsJksUrl: default
dapsTokenUrl: default
dapsUrl: default
connectorTestServiceUrl: {{ .Values.properties.connectorTestServiceUrl }}
connectorregisterUrl: {{ .Values.properties.connectorregisterUrl }}
connectorregisterkeycloakclientId: {{ .Values.properties.connectorregisterkeycloakclientId }}
connectorregisterkeycloakclientSecret: {{ .Values.properties.connectorregisterkeycloakclientSecret }}
connectorregisterkeycloaktokenURI: {{ .Values.properties.connectorregisterkeycloaktokenURI }}
dapsJksUrl: {{ .Values.properties.dapsJksUrl }}
dapsTokenUrl: {{ .Values.properties.dapsTokenUrl }}
dapsUrl: {{ .Values.properties.dapsUrl }}
#dbUrl: jdbc:postgresql://postgresql:5432/postgres
#dbpassword: default
#dbpassword: {{ .Values.properties }}
#dbuser: postgres
dnsname: default
dnsnameProtocol: default
edc_miwUrl: default
edc_ssi_authorityId: default
emailpassword: default
emailuser: default
keycloakAuthserverUrl: default
keycloakBearerOnly: "true"
keycloakClientid: default
keycloakRealm: default
keycloakResource: default
keycloakSslRequired: external
keycloakUseResourceRoleMappings: "true"
kubeappsToken: default
kubeappsUrl: default
mail_from: default
mail_to: default
manual-connector-registration: "false"
manualupdate: "true"
password: default
portalclientid: default
portalclientsecret: default
portalemail: default
portaltokenurl: default
portalurl: default
postgres-password: default
resourceServerIssuer: default
sde_bpndiscovery-hostname: default
sde_connector-discovery-clientId: default
sde_connector-discovery-clientSecret: default
sde_connector-discovery-token-url: default
sde_digital-twins-authentication-url: default
sde_digital-twins-hostname: default
sde_discovery-authentication-url: default
sde_discovery-clientId: default
sde_discovery-clientSecret: default
sde_discovery-grantType: default
sde_dtregistry-url-prefix: default
sde_dtregistryidp-client-id: default
sde_dtregistrytenant-id: default
sde_keycloak-auth: default
sde_keycloak-realm: default
sde_keycloak-tokenUrl: default
sde_partner-pool-clientId: default
sde_partner-pool-clientSecret: default
sde_partner-pool-hostname: default
sde_portal-backend-authentication-url: default
sde_portal-backend-clientId: default
sde_portal-backend-clientSecret: default
sde_portal-backend-hostname: default
sde_resource-server-issuer: default
smtp_auth: "true"
smtp_host: default
smtp_port: default
smtp_tls_enable: "true"
targetCluster: default
targetNamesapce: default
vaultToken: default
vaultUrl: default
dnsname: {{ .Values.properties.dnsname }}
dnsnameProtocol: {{ .Values.properties.dnsnameProtocol }}
edc_miwUrl: {{ .Values.properties.edc_miwUrl }}
edc_ssi_authorityId: {{ .Values.properties.edc_ssi_authorityId }}
emailpassword: {{ .Values.properties.emailpassword }}
emailuser: {{ .Values.properties.emailuser }}
keycloakAuthserverUrl: {{ .Values.properties.keycloakAuthserverUrl }}
keycloakBearerOnly: {{ .Values.properties.keycloakBearerOnly }}
keycloakClientid: {{ .Values.properties.keycloakClientid }}
keycloakRealm: {{ .Values.properties.keycloakRealm }}
keycloakResource: {{ .Values.properties.keycloakResource }}
keycloakSslRequired: {{ .Values.properties.keycloakSslRequired }}
keycloakUseResourceRoleMappings: {{ . Values.properties.keycloakUseResourceRoleMappings }}
kubeappsToken: {{ . Values.properties.kubeappsToken }}
kubeappsUrl: {{ .Values.properties.kubeappsUrl }}
mail_from: {{ .Values.properties.mail_from }}
mail_to: {{ .Values.properties.mail_to }}
manual-connector-registration: {{ .Values.properties.manual-connector-registration }}
manualupdate: {{ .Values.properties.manualupdate }}
password: {{ .Values.properties.password }}
portalclientid: {{ .Values.properties.portalclientid }}
portalclientsecret: {{ .Values.properties.portalclientsecret }}
portalemail: {{ .Values.properties.portalemail }}
portaltokenurl: {{ .Values.properties.portaltokenurl }}
portalurl: {{ .Values.properties.portalurl }}
postgres-password: {{ .Values.properties }}
resourceServerIssuer: {{ .Values.properties.resourceServerIssuer }}
sde_bpndiscovery-hostname: {{ .Values.properties.sde_bpndiscovery-hostname }}
sde_connector-discovery-clientId: {{ .Values.properties.sde_connector-discovery-clientId }}
sde_connector-discovery-clientSecret: {{ .Values.properties.sde_connector-discovery-clientSecret }}
sde_connector-discovery-token-url: {{ .Values.properties.sde_connector-discovery-token-url }}
sde_digital-twins-authentication-url: {{ .Values.properties.sde_digital-twins-authentication-url }}
sde_digital-twins-hostname: {{ .Values.properties.sde_digital-twins-hostname }}
sde_discovery-authentication-url: {{ .Values.properties.sde_discovery-authentication-url }}
sde_discovery-clientId: {{ .Values.properties.sde_discovery-clientId }}
sde_discovery-clientSecret: {{ .Values.properties.sde_discovery-clientSecret }}
sde_discovery-grantType: {{ .Values.properties.sde_discovery-grantType }}
sde_dtregistry-url-prefix: {{ .Values.properties.sde_dtregistry-url-prefix }}
sde_dtregistryidp-client-id: {{ .Values.properties.sde_dtregistryidp-client-id }}
sde_dtregistrytenant-id: {{ .Values.properties.sde_dtregistrytenant-id }}
sde_keycloak-auth: {{ .Values.properties.sde_keycloak-auth }}
sde_keycloak-realm: {{ .Values.properties.sde_keycloak-realm }}
sde_keycloak-tokenUrl: {{ .Values.properties.sde_keycloak-tokenUrl }}
sde_partner-pool-clientId: {{ .Values.properties.sde_partner-pool-clientId }}
sde_partner-pool-clientSecret: {{ .Values.properties.sde_partner-pool-clientSecret }}
sde_partner-pool-hostname: {{ .Values.properties.sde_partner-pool-hostname }}
sde_portal-backend-authentication-url: {{ .Values.properties.sde_portal-backend-authentication-url }}
sde_portal-backend-clientId: {{ .Values.properties.sde_portal-backend-clientId }}
sde_portal-backend-clientSecret: {{ .Values.properties.sde_portal-backend-clientSecret }}
sde_portal-backend-hostname: {{ .Values.properties.sde_portal-backend-hostname }}
sde_resource-server-issuer: {{ .Values.properties.sde_resource-server-issuer }}
smtp_auth: {{ .Values.properties.smtp_auth }}
smtp_host: {{ .Values.properties.smtp_host }}
smtp_port: {{ .Values.properties.smtp_port }}
smtp_tls_enable: {{ .Values.properties.smtp_tls_enable }}
targetCluster: {{ .Values.properties.targetCluster }}
targetNamesapce: {{ .Values.properties.targetNamesapce }}
vaultToken: {{ .Values.properties.vaultToken }}
vaultUrl: {{ .Values.properties.vaultUrl }}

74 changes: 74 additions & 0 deletions charts/orchestrator/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,80 @@ postgresql:
auth:
username: "postgres"
password: "default"
postgresPassword: "default"
database: "postgres"
port: 5432
existingSecret: ""

properties:
connectorTestServiceUrl: default
connectorregisterUrl: default
connectorregisterkeycloakclientId: default
connectorregisterkeycloakclientSecret: default
connectorregisterkeycloaktokenURI: default
dapsJksUrl: default
dapsTokenUrl: default
dapsUrl: default
#dbUrl: jdbc:postgresql://postgresql:5432/postgres
#dbpassword: default
#dbuser: postgres
dnsname: default
dnsnameProtocol: default
edc_miwUrl: default
edc_ssi_authorityId: default
emailpassword: default
emailuser: default
keycloakAuthserverUrl: default
keycloakBearerOnly: "true"
keycloakClientid: default
keycloakRealm: default
keycloakResource: default
keycloakSslRequired: external
keycloakUseResourceRoleMappings: "true"
kubeappsToken: default
kubeappsUrl: default
mail_from: default
mail_to: default
manual-connector-registration: "false"
manualupdate: "true"
password: default
portalclientid: default
portalclientsecret: default
portalemail: default
portaltokenurl: default
portalurl: default
postgres-password: default
resourceServerIssuer: default
sde_bpndiscovery-hostname: default
sde_connector-discovery-clientId: default
sde_connector-discovery-clientSecret: default
sde_connector-discovery-token-url: default
sde_digital-twins-authentication-url: default
sde_digital-twins-hostname: default
sde_discovery-authentication-url: default
sde_discovery-clientId: default
sde_discovery-clientSecret: default
sde_discovery-grantType: default
sde_dtregistry-url-prefix: default
sde_dtregistryidp-client-id: default
sde_dtregistrytenant-id: default
sde_keycloak-auth: default
sde_keycloak-realm: default
sde_keycloak-tokenUrl: default
sde_partner-pool-clientId: default
sde_partner-pool-clientSecret: default
sde_partner-pool-hostname: default
sde_portal-backend-authentication-url: default
sde_portal-backend-clientId: default
sde_portal-backend-clientSecret: default
sde_portal-backend-hostname: default
sde_resource-server-issuer: default
smtp_auth: "true"
smtp_host: default
smtp_port: default
smtp_tls_enable: "true"
targetCluster: default
targetNamesapce: default
vaultToken: default
vaultUrl: default

0 comments on commit 416fd23

Please sign in to comment.