Commit 42da9644 authored by Radu Carpa's avatar Radu Carpa Committed by rcarpa
Browse files

servers: deprecate implicit ca and proxy volume mounts 

Check the following commit for details:
https://github.com/rucio/helm-charts/commit/8ab83a60e427295fe126cb25d39b977a30471aca
parent 011bdbf5

charts/rucio-server/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
name: rucio-server

version: 1.30.5

version: 1.30.6

apiVersion: v1

description: A Helm chart to deploy servers for Rucio

keywords:

charts/rucio-server/templates/auth_deployment.yaml

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ spec: 
        persistentVolumeClaim:

          claimName: {{ $val.name }}

      {{- end}}

{{- if .Values.useDeprecatedImplicitSecrets }}

{{- if .Values.useSSL.authServer }}

      - name: hostcert

        secret:
@@ -74,6 +75,7 @@ spec: 
      - name: cafile

        secret:

          secretName: {{ .Release.Name }}-auth-cafile

{{- end }}

{{- end }}

      containers:

{{- if .Values.exposeErrorLogs.authServer }}
@@ -152,6 +154,7 @@ spec: 
            - name: {{ $key }}

              mountPath: {{ $val.mountPath }}

            {{- end}}

{{- if .Values.useDeprecatedImplicitSecrets }}

{{- if .Values.useSSL.authServer }}

            - name: hostcert

              mountPath: /etc/grid-security/hostcert.pem
@@ -162,6 +165,7 @@ spec: 
            - name: cafile

              mountPath: /etc/grid-security/ca.pem

              subPath: ca.pem

{{- end }}

{{- end }}

          env:

            {{- range $key, $val := .Values.httpd_config }}

charts/rucio-server/templates/deployment.yaml

+10 −15
Original line number Diff line number Diff line 
{{- if gt .Values.replicaCount 0.0 -}}

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.yaml

  labels:

    app: {{ template "rucio.name" . }}

    chart: "{{ .Chart.Name }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

type: Opaque

data:

{{- $common_config := .Values.config | default dict | mustToPrettyJson | b64enc }}

  common.json: {{ $common_config | quote }}

---

apiVersion: apps/v1

kind: Deployment

metadata:
@@ -69,7 +56,8 @@ spec: 
      volumes:

      - name: config

        secret:

          secretName: {{ template "rucio.fullname" . }}.config.yaml

          secretName: {{ template "rucio.fullname" . }}.config.common

      {{- if .Values.useDeprecatedImplicitSecrets }}

      {{- if .Values.ftsRenewal.enabled }}

      - name: proxy-volume

        secret:
@@ -78,6 +66,7 @@ spec: 
        secret:

          secretName: {{ .Release.Name }}-rucio-ca-bundle

      {{- end }}

      {{- end }}

      - name: httpdlog

        emptyDir: {}

      {{- range $key, $val := .Values.additionalSecrets }}
@@ -90,6 +79,7 @@ spec: 
        persistentVolumeClaim:

          claimName: {{ $val.name }}

      {{- end}}

{{- if .Values.useDeprecatedImplicitSecrets }}

{{- if .Values.useSSL.server }}

      - name: hostcert

        secret:
@@ -100,6 +90,7 @@ spec: 
      - name: cafile

        secret:

          secretName: {{ .Release.Name }}-server-cafile

{{- end }}

{{- end }}

      containers:

{{- if .Values.exposeErrorLogs.server }}
@@ -136,12 +127,14 @@ spec: 
          - name: config

            mountPath: /opt/rucio/etc/conf.d/10_common.json

            subPath: common.json

          {{- if .Values.useDeprecatedImplicitSecrets }}

          {{- if .Values.ftsRenewal.enabled }}

          - name: proxy-volume

            mountPath: /opt/proxy

          - name: ca-volume

            mountPath: /opt/certs

          {{- end }}

          {{- end }}

          - name: httpdlog

            mountPath: /var/log/httpd

          {{- range $key, $val := .Values.additionalSecrets }}
@@ -162,6 +155,7 @@ spec: 
          - name: {{ $key }}

            mountPath: {{ $val.mountPath }}

          {{- end}}

{{- if .Values.useDeprecatedImplicitSecrets }}

{{- if .Values.useSSL.server }}

          - name: hostcert

            mountPath: /etc/grid-security/hostcert.pem
@@ -172,6 +166,7 @@ spec: 
          - name: cafile

            mountPath: /etc/grid-security/ca.pem

            subPath: ca.pem

{{- end }}

{{- end }}

          ports:

            - name: http

charts/rucio-server/templates/secrets.yaml

+14 −0
Original line number Diff line number Diff line 
apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.config.common

  labels:

    app: {{ template "rucio.name" . }}

    chart: "{{ .Chart.Name }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  {{- $common_config := .Values.config | default dict | mustToPrettyJson | b64enc }}

  common.json: {{ $common_config | quote }}

---

apiVersion: v1

kind: Secret

metadata:

  name: {{ template "rucio.fullname" . }}.cfg

  labels:

charts/rucio-server/templates/trace_deployment.yaml

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ spec: 
        secret:

          secretName: {{ coalesce $val.secretFullName (printf "%s-%s" $.Release.Name $val.secretName) }}

      {{- end}}

{{- if .Values.useDeprecatedImplicitSecrets }}

{{- if .Values.useSSL.traceServer }}

      - name: hostcert

        secret:
@@ -69,6 +70,7 @@ spec: 
      - name: cafile

        secret:

          secretName: {{ .Release.Name }}-trace-cafile

{{- end }}

{{- end }}

      containers:

{{- if .Values.exposeErrorLogs.traceServer }}
@@ -127,6 +129,7 @@ spec: 
              subPath: common.json

            - name: httpdlog

              mountPath: /var/log/httpd

{{- if .Values.useDeprecatedImplicitSecrets }}

{{- if .Values.useSSL.traceServer }}

            - name: hostcert

              mountPath: /etc/grid-security/hostcert.pem
@@ -137,6 +140,7 @@ spec: 
            - name: cafile

              mountPath: /etc/grid-security/ca.pem

              subPath: ca.pem

{{- end }}

{{- end }}

            {{- range $key, $val := .Values.additionalSecrets }}

            {{- /* TODO: depreacte and remove support for subPaths (at plural) case */}}