Commit c81827f2 authored by Matt Pryor's avatar Matt Pryor
Browse files

Make overriding of env vars easier

parent fb7a7327

cluster/kubernetes/charts/templates/cog/deployment.yaml

+3 −3
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ spec: 
                name: "{{ template "fullname" . }}-environment-common"

          env:

            - name: ESGF_COG_SITE_NAME

              value: "Local CoG"

              value: {{ default "Local CoG" .Values.cog.environment.ESGF_COG_SITE_NAME | quote }}

            - name: ESGF_COG_HOME_PROJECT

              value: TestProject

              value: {{ default "TestProject" .Values.cog.environment.ESGF_COG_HOME_PROJECT | quote }}

            - name: ESGF_COG_TIME_ZONE

              value: "Europe/London"

              value: {{ default "Europe/London" .Values.cog.environment.ESGF_COG_TIME_ZONE | quote }}

            - name: ESGF_COG_SECRET_KEY

              valueFrom:

                secretKeyRef:

cluster/kubernetes/charts/templates/configuration/config-overrides.yaml

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ metadata: 
{{ include "default-labels" . | indent 4 }}

    component: configuration

data:

{{ toYaml .Values.configuration | indent 2 }}
 
{{ toYaml .Values.configuration.overrides | indent 2 }}

cluster/kubernetes/charts/templates/configuration/environment-common.yaml

+10 −10
Original line number Diff line number Diff line
@@ -7,19 +7,19 @@ metadata: 
    component: configuration

data:

  ESGF_HOSTNAME: "{{ .Values.hostname }}"

  ESGF_PEER_GROUP: esgf-test

  ESGF_ATTRIBUTE_SERVICE_ENDPOINT: "https://{{ .Values.hostname }}/esgf-idp/saml/soap/secure/attributeService.htm"

  ESGF_REGISTRATION_SERVICE_ENDPOINT: "https://{{ .Values.hostname }}/esgf-idp/secure/registrationService.htm"

  ESGF_OPENID_ENDPOINT: "https://{{ .Values.hostname }}/esgf-idp/idp/openidServer.htm"

  ESGF_PEER_GROUP: {{ default "esgf-test" .Values.configuration.environment.ESGF_PEER_GROUP | quote }}

  ESGF_ATTRIBUTE_SERVICE_ENDPOINT: {{ default (printf "https://%s/esgf-idp/saml/soap/secure/attributeService.htm" .Values.hostname) .Values.configuration.environment.ESGF_ATTRIBUTE_SERVICE_ENDPOINT | quote }}

  ESGF_REGISTRATION_SERVICE_ENDPOINT: {{ default (printf "https://%s/esgf-idp/secure/registrationService.htm" .Values.hostname) .Values.configuration.environment.ESGF_REGISTRATION_SERVICE_ENDPOINT | quote }}

  ESGF_OPENID_ENDPOINT: {{ default (printf "https://%s/esgf-idp/idp/openidServer.htm" .Values.hostname) .Values.configuration.environment.ESGF_OPENID_ENDPOINT | quote }}

  ESGF_DATABASE_HOST: "{{ template "fullname" . }}-postgres-security"

  ESGF_DATABASE_PORT: "5432"

  ESGF_DATABASE_USER: dbsuper

  ESGF_DATABASE_NAME: esgcet

  ESGF_SEARCH_SERVICE_ENDPOINT: "https://{{ .Values.hostname }}/esg-search/search"

  ESGF_IDP_PEER: "{{ .Values.hostname }}"

  ESGF_INDEX_PEER: "{{ .Values.hostname }}"

  ESGF_PUBLISH_SERVICE_ENDPOINT: "https://{{ .Values.hostname }}/esg-search/remote/secure/client-cert/hessian/publishingService"

  ESGF_SEARCH_SERVICE_ENDPOINT: {{ default (printf "https://%s/esg-search/search" .Values.hostname) .Values.configuration.environment.ESGF_SEARCH_SERVICE_ENDPOINT | quote }}

  ESGF_IDP_PEER: {{ default .Values.hostname .Values.configuration.environment.ESGF_IDP_PEER | quote }}

  ESGF_INDEX_PEER: {{ default .Values.hostname .Values.configuration.environment.ESGF_INDEX_PEER | quote }}

  ESGF_PUBLISH_SERVICE_ENDPOINT: {{ default (printf "https://%s/esg-search/remote/secure/client-cert/hessian/publishingService" .Values.hostname) .Values.configuration.environment.ESGF_PUBLISH_SERVICE_ENDPOINT | quote }}

  ESGF_SOLR_QUERY_URL: "http://{{ template "fullname" . }}-solr-slave:8983/solr"

  ESGF_SOLR_PUBLISH_URL: "http://{{ template "fullname" . }}-solr-master:8983/solr"

  ESGF_AUTHORIZATION_SERVICE_ENDPOINT: "https://{{ .Values.hostname }}/esg-orp/saml/soap/secure/authorizationService.htm"

  ESGF_SLCS_ENDPOINT: "https://{{ .Values.hostname }}/esgf-slcs"
 
  ESGF_AUTHORIZATION_SERVICE_ENDPOINT: {{ default (printf "https://%s/esg-orp/saml/soap/secure/authorizationService.htm" .Values.hostname) .Values.configuration.environment.ESGF_AUTHORIZATION_SERVICE_ENDPOINT | quote }}

  ESGF_SLCS_ENDPOINT: {{ default (printf "https://%s/esgf-slcs" .Values.hostname) .Values.configuration.environment.ESGF_SLCS_ENDPOINT | quote }}

cluster/kubernetes/charts/templates/publisher/deployment.yaml

+6 −6
Original line number Diff line number Diff line
@@ -115,15 +115,15 @@ spec: 
            - name: ESGF_DATABASE_NAME

              value: esgcet

            - name: ESGF_HESSIAN_METADATA_URL

              value: "https://{{ .Values.hostname }}/esgcet/remote/hessian/guest/remoteMetadataService"

              value: {{ default (printf "https://%s/esgcet/remote/hessian/guest/remoteMetadataService" .Values.hostname) .Values.publisher.environment.ESGF_HESSIAN_METADATA_URL | quote }}

            - name: ESGF_HESSIAN_URL

              value: "https://{{ .Values.hostname }}/esg-search/remote/secure/client-cert/hessian/publishingService"

              value: {{ default (printf "https://%s/esg-search/remote/secure/client-cert/hessian/publishingService" .Values.hostname) .Values.publisher.environment.ESGF_HESSIAN_URL | quote }}

            - name: ESGF_TDS_CATALOG_URL

              value: "https://{{ .Values.hostname }}/thredds/catalog/esgcet"

              value: {{ default (printf "https://%s/thredds/catalog/esgcet" .Values.hostname) .Values.publisher.environment.ESGF_TDS_CATALOG_URL | quote }}

            - name: ESGF_TDS_REINIT_URL

              value: "https://{{ .Values.hostname }}/thredds/admin/debug?Catalogs/recheck"

              value: {{ default (printf "https://%s/thredds/admin/debug?Catalogs/recheck" .Values.hostname) .Values.publisher.environment.ESGF_TDS_REINIT_URL | quote }}

            - name: ESGF_TDS_REINIT_ERROR_URL

              value: "https://{{ .Values.hostname }}/thredds/admin/content/logs/catalogInit.log"

              value: {{ default (printf "https://%s/thredds/admin/content/logs/catalogInit.log" .Values.hostname) .Values.publisher.environment.ESGF_TDS_REINIT_ERROR_URL | quote }}

            - name: ESGF_TDS_USERNAME

              value: rootAdmin

            - name: ESGF_TDS_PASSWORD
@@ -132,7 +132,7 @@ spec: 
                  name: "{{ template "fullname" . }}-secrets"

                  key: "rootadmin-password"

            - name: ESGF_SLCS_CERTIFICATE_URL

              value: "https://{{ .Values.hostname }}/esgf-slcs/onlineca/certificate/"

              value: {{ default (printf "https://%s/esgf-slcs/onlineca/certificate/" .Values.hostname) .Values.publisher.environment.ESGF_SLCS_CERTIFICATE_URL | quote }}

          volumeMounts:

            - mountPath: /esg/content/thredds/esgcet

              name: tds-content

cluster/kubernetes/charts/templates/slcs/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ spec: 
            - name: ESGF_SLCS_BASIC_AUTH_REALM

              value: "{{ .Values.hostname }}"

            - name: ONLINECA_SUBJECT_NAME_TEMPLATE

              value: "/DC=esgf/CN={user}"

              value: {{ default "/DC=esgf/CN={user}" .Values.slcs.environment.ONLINECA_SUBJECT_NAME_TEMPLATE | quote }}

            - name: ONLINECA_CERT_PATH

              value: /esg/certificates/slcsca/ca.crt

            - name: ONLINECA_KEY_PATH