diff --git a/README.md b/README.md index 75e1e09..0d73eb4 100644 --- a/README.md +++ b/README.md @@ -1128,13 +1128,13 @@ To comply with the Gitea helm chart definition of the digest parameter, a "custo | `nodeSelector` | NodeSelector for the deployment | `{}` | | `tolerations` | Tolerations for the deployment | `[]` | | `topologySpreadConstraints` | TopologySpreadConstraints for the deployment | `[]` | -| `dnsConfig` | dnsConfig for the deployment | `{}` | | `priorityClassName` | priorityClassName for the deployment | `""` | | `deployment.enabled` | Enable the deployment of Gitea. | `true` | | `deployment.annotations` | Annotations for the Gitea deployment to be created | `{}` | | `deployment.labels` | Labels for the deployment | `{}` | | `deployment.affinity` | Affinity for the deployment. | `{}` | | `deployment.terminationGracePeriodSeconds` | How long to wait until forcefully kill the pod | `60` | +| `deployment.dnsConfig` | dnsConfig of the Gitea deployment. | `{}` | | `deployment.gitea.env` | Additional environment variables to pass to the Gitea container. | `[]` | ### Secret diff --git a/templates/gitea/deployment.yaml b/templates/gitea/deployment.yaml index ba870c9..e8dfedd 100644 --- a/templates/gitea/deployment.yaml +++ b/templates/gitea/deployment.yaml @@ -439,9 +439,9 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.dnsConfig }} + {{- if .Values.deployment.dnsConfig }} dnsConfig: - {{- toYaml .Values.dnsConfig | nindent 8 }} + {{- toYaml .Values.deployment.dnsConfig | nindent 8 }} {{- end }} volumes: - name: init diff --git a/templates/gitea/deprecation.yaml b/templates/gitea/deprecation.yaml index 5d4b5ac..00eaf95 100644 --- a/templates/gitea/deprecation.yaml +++ b/templates/gitea/deprecation.yaml @@ -49,4 +49,9 @@ {{- if .Values.deployment.env -}} {{- fail "`deployment.env` does no longer exist. Please refer to the changelog and configure `deployment.gitea.env` instead." -}} {{- end -}} + + {{/* DNS CONFIG */}} + {{- if .Values.dnsConfig -}} + {{- fail "`dnsConfig` does no longer exist. Please refer to the changelog and configure `deployment.dnsConfig` instead." -}} + {{- end -}} {{- end -}} diff --git a/unittests/helm/deployment/basic.yaml b/unittests/helm/deployment/basic.yaml index 1d2205b..65eb376 100644 --- a/unittests/helm/deployment/basic.yaml +++ b/unittests/helm/deployment/basic.yaml @@ -103,6 +103,29 @@ tests: operator: In values: - linux + - it: dnsConfig is undefined + template: templates/gitea/deployment.yaml + asserts: + - notExists: + path: spec.template.spec.dnsConfig + - it: dnsConfig is defined + template: templates/gitea/deployment.yaml + set: + deployment.dnsConfig: + nameservers: + - 192.0.2.1 + options: + - name: ndots + value: "2" + asserts: + - equal: + path: spec.template.spec.dnsConfig + value: + nameservers: + - 192.0.2.1 + options: + - name: ndots + value: "2" - it: "injects TMP_EXISTING_ENVS_FILE as environment variable to 'init-app-ini' init container" template: templates/gitea/deployment.yaml diff --git a/unittests/helm/deployment/deprecations.yaml b/unittests/helm/deployment/deprecations.yaml index 29606a7..b8b00ae 100644 --- a/unittests/helm/deployment/deprecations.yaml +++ b/unittests/helm/deployment/deprecations.yaml @@ -31,6 +31,14 @@ tests: asserts: - failedTemplate: errorMessage: "`deployment.env` does no longer exist. Please refer to the changelog and configure `deployment.gitea.env` instead." + - it: fails when the removed `dnsConfig` value is set + set: + dnsConfig: + nameservers: + - 192.0.2.1 + asserts: + - failedTemplate: + errorMessage: "`dnsConfig` does no longer exist. Please refer to the changelog and configure `deployment.dnsConfig` instead." - it: skips the deprecation checks when `checkDeprecation` is disabled set: checkDeprecation: false @@ -39,6 +47,9 @@ tests: deployment.env: - name: VARIABLE value: my-value + dnsConfig: + nameservers: + - 192.0.2.1 asserts: - hasDocuments: count: 0 diff --git a/values.yaml b/values.yaml index c133b06..fb5349a 100644 --- a/values.yaml +++ b/values.yaml @@ -322,9 +322,6 @@ tolerations: [] ## @param topologySpreadConstraints TopologySpreadConstraints for the deployment topologySpreadConstraints: [] -## @param dnsConfig dnsConfig for the deployment -dnsConfig: {} - ## @param priorityClassName priorityClassName for the deployment priorityClassName: "" @@ -357,6 +354,17 @@ deployment: # values: # - amd64 + ## @param deployment.dnsConfig dnsConfig of the Gitea deployment. + dnsConfig: {} + # nameservers: + # - 192.0.2.1 # this is an example + # searches: + # - ns1.svc.cluster-domain.example + # - my.dns.search.suffix + # options: + # - name: ndots + # value: "2" + # - name: edns0 gitea: ## @param deployment.gitea.env Additional environment variables to pass to the gitea container.