diff --git a/config/nsodev/values.yaml b/config/nsodev/values.yaml index 7065854..768e264 100644 --- a/config/nsodev/values.yaml +++ b/config/nsodev/values.yaml @@ -1,3 +1,28 @@ +iam: + keycloak: + host: "https://prodwork01-kube-keycloak.smardigo.digital" + +# services which aren't part of the kubernetes cluster +sharedService: + postgres: + host: + ip: "10.3.0.7" + name: "prodwork01-postgres-01" + maria: + host: + ip: "10.3.0.4" + name: "prodwork01-maria-01" + elastic: + host01: + ip: "10.3.0.13" + name: "prodwork01-elastic-stack-elastic-01" + host02: + ip: "10.3.0.14" + name: "prodwork01-elastic-stack-elastic-02" + host03: + ip: "10.3.0.16" + name: "prodwork01-elastic-stack-elastic-03" + harbor: host: name: "prodnso-harbor-01.smardigo.digital" \ No newline at end of file diff --git a/smardigo/templates/connect/deployment.yml b/smardigo/templates/connect/deployment.yml index 0780e06..1d1d4c3 100644 --- a/smardigo/templates/connect/deployment.yml +++ b/smardigo/templates/connect/deployment.yml @@ -14,9 +14,6 @@ spec: app: "connect" spec: hostAliases: - - ip: "{{ .Values.sharedService.keycloak.host.ip }}" - hostnames: - - "{{ .Values.sharedService.keycloak.host.name }}" - ip: "{{ .Values.sharedService.postgres.host.ip }}" hostnames: - "{{ .Values.sharedService.postgres.host.name }}" diff --git a/smardigo/templates/iam/deployment.yml b/smardigo/templates/iam/deployment.yml index b1ec885..65e2ca6 100644 --- a/smardigo/templates/iam/deployment.yml +++ b/smardigo/templates/iam/deployment.yml @@ -13,10 +13,6 @@ spec: labels: app: "iam" spec: - hostAliases: - - ip: "{{ .Values.sharedService.keycloak.host.ip }}" - hostnames: - - "{{ .Values.sharedService.keycloak.host.name }}" containers: - name: "iam" image: "{{ .Values.harbor.host.name }}/{{ .Values.iam.image.name }}:{{ .Values.iam.image.version }}" @@ -31,7 +27,7 @@ spec: key: JWT_SECRET - name: IAM_KEYCLOAK_AUTH_SERVER_URL - value: "https://{{ .Values.sharedService.keycloak.host.name }}/auth" + value: "https://{{ .Values.iam.keycloak.host.name }}/auth" - name: IAM_KEYCLOAK_ADMIN_USER value: "{{ .Values.iam.keycloak.username }}" - name: IAM_KEYCLOAK_ADMIN_PASSWORD diff --git a/smardigo/values.yaml b/smardigo/values.yaml index d6010ab..21c3ae0 100644 --- a/smardigo/values.yaml +++ b/smardigo/values.yaml @@ -48,6 +48,7 @@ iam: version: "latest" name: "smardigo/iam-app" keycloak: + host: "https://dev-keycloak-01.smardigo.digital" username: "keycloak-admin" password: "keycloak-admin" jwt: