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

Add /esg/config overrides

parent 6fcc6789

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

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ spec: 
        checksum/secrets: {{ include (print $.Template.BasePath "/configuration/secrets.yaml") . | sha256sum }}

        checksum/trust-bundle: {{ include (print $.Template.BasePath "/configuration/trust-bundle.yaml") . | sha256sum }}

        checksum/environment-common: {{ include (print $.Template.BasePath "/configuration/environment-common.yaml") . | sha256sum }}

        checksum/esg-config-overrides: {{ include (print $.Template.BasePath "/configuration/esg-config-overrides.yaml") . | sha256sum }}

    spec:

      initContainers:

        # Wait for postgres to become available before starting
@@ -120,9 +121,16 @@ spec: 
            - mountPath: /esg/certificates/esg-trust-bundle.pem

              name: trust-bundle

              subPath: esg-trust-bundle.pem

              readOnly: true

            - mountPath: /esg/config/.overrides

              name: esg-config-overrides

              readOnly: true

          resources:

{{ toYaml .Values.auth.resources | indent 12 }}

      volumes:

        - name: trust-bundle

          configMap:

            name: "{{ template "fullname" . }}-trust-bundle"

        - name: esg-config-overrides

          configMap:

            name: "{{ template "fullname" . }}-esg-config-overrides"

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ spec: 
        checksum/secrets: {{ include (print $.Template.BasePath "/configuration/secrets.yaml") . | sha256sum }}

        checksum/trust-bundle: {{ include (print $.Template.BasePath "/configuration/trust-bundle.yaml") . | sha256sum }}

        checksum/environment-common: {{ include (print $.Template.BasePath "/configuration/environment-common.yaml") . | sha256sum }}

        checksum/esg-config-overrides: {{ include (print $.Template.BasePath "/configuration/esg-config-overrides.yaml") . | sha256sum }}

    spec:

      initContainers:

        # Wait for databases to become available before starting
@@ -153,15 +154,22 @@ spec: 
            - mountPath: /esg/certificates/esg-trust-bundle.pem

              name: trust-bundle

              subPath: esg-trust-bundle.pem

              readOnly: true

            - mountPath: /esg/config/.esg_pg_pass

              name: esg-secrets

              subPath: security-database-password

              readOnly: true

            - mountPath: /esg/secrets/cog-database-password

              name: esg-secrets

              subPath: cog-database-password

              readOnly: true

            - mountPath: /esg/config/.esgf_pass

              name: esg-secrets

              subPath: rootadmin-password

              readOnly: true

            - mountPath: /esg/config/.overrides

              name: esg-config-overrides

              readOnly: true

          resources:

{{ toYaml .Values.cog.resources | indent 12 }}

      volumes:
@@ -171,3 +179,6 @@ spec: 
        - name: esg-secrets

          secret:

            secretName: "{{ template "fullname" . }}-secrets"

        - name: esg-config-overrides

          configMap:

            name: "{{ template "fullname" . }}-esg-config-overrides"

cluster/kubernetes/charts/templates/idp-node/deployment.yaml

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ spec: 
        checksum/secrets: {{ include (print $.Template.BasePath "/configuration/secrets.yaml") . | sha256sum }}

        checksum/trust-bundle: {{ include (print $.Template.BasePath "/configuration/trust-bundle.yaml") . | sha256sum }}

        checksum/environment-common: {{ include (print $.Template.BasePath "/configuration/environment-common.yaml") . | sha256sum }}

        checksum/esg-config-overrides: {{ include (print $.Template.BasePath "/configuration/esg-config-overrides.yaml") . | sha256sum }}

    spec:

      initContainers:

        # Wait for security database to become available before starting
@@ -100,12 +101,18 @@ spec: 
            - mountPath: /esg/certificates/esg-trust-bundle.pem

              name: trust-bundle

              subPath: esg-trust-bundle.pem

              readOnly: true

            - mountPath: /esg/config/.esg_pg_pass

              name: esg-secrets

              subPath: security-database-password

              readOnly: true

            - mountPath: /esg/config/.esgf_pass

              name: esg-secrets

              subPath: rootadmin-password

              readOnly: true

            - mountPath: /esg/config/.overrides

              name: esg-config-overrides

              readOnly: true

          resources:

{{ toYaml .Values.idpNode.resources | indent 12 }}

      volumes:
@@ -115,3 +122,6 @@ spec: 
        - name: esg-secrets

          secret:

            secretName: "{{ template "fullname" . }}-secrets"

        - name: esg-config-overrides

          configMap:

            name: "{{ template "fullname" . }}-esg-config-overrides"

cluster/kubernetes/charts/templates/index-node/deployment.yaml

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ spec: 
      annotations:

        checksum/trust-bundle: {{ include (print $.Template.BasePath "/configuration/trust-bundle.yaml") . | sha256sum }}

        checksum/environment-common: {{ include (print $.Template.BasePath "/configuration/environment-common.yaml") . | sha256sum }}

        checksum/esg-config-overrides: {{ include (print $.Template.BasePath "/configuration/esg-config-overrides.yaml") . | sha256sum }}

    spec:

      initContainers:

        # Make sure Solr is up before starting
@@ -66,9 +67,16 @@ spec: 
            - mountPath: /esg/certificates/esg-trust-bundle.pem

              name: trust-bundle

              subPath: esg-trust-bundle.pem

              readOnly: true

            - mountPath: /esg/config/.overrides

              name: esg-config-overrides

              readOnly: true

          resources:

{{ toYaml .Values.indexNode.resources | indent 12 }}

      volumes:

        - name: trust-bundle

          configMap:

            name: "{{ template "fullname" . }}-trust-bundle"

        - name: esg-config-overrides

          configMap:

            name: "{{ template "fullname" . }}-esg-config-overrides"

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

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ spec: 
        checksum/hostcert: {{ include (print $.Template.BasePath "/configuration/hostcert.yaml") . | sha256sum }}

        checksum/trust-bundle: {{ include (print $.Template.BasePath "/configuration/trust-bundle.yaml") . | sha256sum }}

        checksum/environment-common: {{ include (print $.Template.BasePath "/configuration/environment-common.yaml") . | sha256sum }}

        checksum/esg-config-overrides: {{ include (print $.Template.BasePath "/configuration/esg-config-overrides.yaml") . | sha256sum }}

    spec:

      containers:

        - name: orp
@@ -61,9 +62,14 @@ spec: 
          volumeMounts:

            - mountPath: /esg/certificates/hostcert

              name: hostcert

              readOnly: true

            - mountPath: /esg/certificates/esg-trust-bundle.pem

              name: trust-bundle

              subPath: esg-trust-bundle.pem

              readOnly: true

            - mountPath: /esg/config/.overrides

              name: esg-config-overrides

              readOnly: true

          resources:

{{ toYaml .Values.orp.resources | indent 12 }}

      volumes:
@@ -73,3 +79,6 @@ spec: 
        - name: trust-bundle

          configMap:

            name: "{{ template "fullname" . }}-trust-bundle"

        - name: esg-config-overrides

          configMap:

            name: "{{ template "fullname" . }}-esg-config-overrides"