Unverified Commit 4b1e466f authored by rcarpa's avatar rcarpa Committed by GitHub
Browse files

Merge pull request #69 from rcarpa/fix_new_config_parsing_pod_restarts 

daemons: add config checksum as pod annotation
parents 76256962 2212ed6b

charts/rucio-daemons/Chart.yaml

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

version: 1.26.6

version: 1.26.7

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

charts/rucio-daemons/templates/abacus-account.yaml

+5 −4
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ metadata: 
    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.abacusAccount.config | default dict | mustToPrettyJson | b64enc | quote }}

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

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

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

  rucio.config.component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -46,9 +48,8 @@ spec: 
    {{- with .Values.podLabels }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    {{- if or .Values.podAnnotations .Values.abacusAccount.podAnnotations}}

      annotations:

    {{- end }}

        checksum/config: {{ print "%s%s" $common_config $component_config | sha1sum }}

    {{- with .Values.podAnnotations }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

charts/rucio-daemons/templates/abacus-collection-replica.yaml

+5 −4
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ metadata: 
    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.abacusCollectionReplica.config | default dict | mustToPrettyJson | b64enc | quote }}

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

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

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

  rucio.config.component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -46,9 +48,8 @@ spec: 
    {{- with .Values.podLabels }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    {{- if or .Values.podAnnotations .Values.abacusCollectionReplica.podAnnotations}}

      annotations:

    {{- end }}

        checksum/config: {{ print "%s%s" $common_config $component_config | sha1sum }}

    {{- with .Values.podAnnotations }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

charts/rucio-daemons/templates/abacus-rse.yaml

+5 −4
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ metadata: 
    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.abacusRse.config | default dict | mustToPrettyJson | b64enc | quote }}

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

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

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

  rucio.config.component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -46,9 +48,8 @@ spec: 
    {{- with .Values.podLabels }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    {{- if or .Values.podAnnotations .Values.abacusRse.podAnnotations}}

      annotations:

    {{- end }}

        checksum/config: {{ print "%s%s" $common_config $component_config | sha1sum }}

    {{- with .Values.podAnnotations }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

charts/rucio-daemons/templates/automatix.yaml

+5 −4
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ metadata: 
    heritage: "{{ .Release.Service }}"

type: Opaque

data:

  rucio.config.common.json: {{ .Values.config | default dict | mustToPrettyJson | b64enc | quote }}

  rucio.config.component.json: {{ .Values.automatix.config | default dict | mustToPrettyJson | b64enc | quote }}

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

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

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

  rucio.config.component.json: {{ $component_config | quote }}

---

apiVersion: apps/v1

kind: Deployment
@@ -46,9 +48,8 @@ spec: 
    {{- with .Values.podLabels }}

        {{- toYaml . | nindent 8 }}

    {{- end }}

    {{- if or .Values.podAnnotations .Values.automatix.podAnnotations}}

      annotations:

    {{- end }}

        checksum/config: {{ print "%s%s" $common_config $component_config | sha1sum }}

    {{- with .Values.podAnnotations }}

        {{- toYaml . | nindent 8 }}

    {{- end }}