Take dnsPolicy from .Values.pod.dns_policy variable

Change-Id: Iae7caa5bdefe7749231c031c6003591a6251fa97
2019-07-10 14:13:53 -05:00 · 2019-07-10 14:13:53 -05:00 · 3b5a1c7909
commit 3b5a1c7909
parent 769d0980f0
23 changed files with 23 additions and 14 deletions
--- a/elastic-metricbeat/templates/daemonset-node-metrics.yaml
+++ b/elastic-metricbeat/templates/daemonset-node-metrics.yaml
@ -91,7 +91,7 @@ spec:
        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
    spec:
      hostNetwork: true
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      serviceAccountName: {{ $serviceAccountName }}
 {{ if $envAll.Values.pod.tolerations.metricbeat.enabled }}
 {{ tuple $envAll "metricbeat" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
--- a/elastic-metricbeat/values.yaml
+++ b/elastic-metricbeat/values.yaml
@ -221,6 +221,7 @@ pod:
          enabled: true
          min_ready_seconds: 0
          max_unavailable: 1
+  dns_policy: "ClusterFirstWithHostNet"
  replicas:
    metricbeat: 1
  resources:
--- a/elastic-packetbeat/templates/daemonset.yaml
+++ b/elastic-packetbeat/templates/daemonset.yaml
@ -92,7 +92,7 @@ spec:
      securityContext:
        runAsUser: 0
      hostNetwork: true
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      serviceAccountName: {{ $serviceAccountName }}
      initContainers:
 {{ tuple $envAll "packetbeat" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
--- a/elastic-packetbeat/values.yaml
+++ b/elastic-packetbeat/values.yaml
@ -159,6 +159,7 @@ pod:
          enabled: true
          min_ready_seconds: 0
          max_unavailable: 1
+  dns_policy: "ClusterFirstWithHostNet"
  replicas:
    packetbeat: 1
  resources:
--- a/fluentbit/templates/daemonset-fluent-bit.yaml
+++ b/fluentbit/templates/daemonset-fluent-bit.yaml
@ -105,7 +105,7 @@ spec:
 {{ end }}
      hostNetwork: true
      hostPID: true
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      initContainers:
 {{ tuple $envAll "fluentbit" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
      containers:
--- a/fluentbit/values.yaml
+++ b/fluentbit/values.yaml
@ -220,6 +220,7 @@ pod:
        default: preferredDuringSchedulingIgnoredDuringExecution
      topologyKey:
        default: kubernetes.io/hostname
+  dns_policy: "ClusterFirstWithHostNet"
  lifecycle:
    upgrades:
      daemonsets:
--- a/gnocchi/requirements.yaml
+++ b/gnocchi/requirements.yaml
@ -15,4 +15,4 @@
 dependencies:
  - name: helm-toolkit
    repository: http://localhost:8879/charts
-    version: 0.1.0
+    version: 0.1.0
--- a/ingress/templates/deployment-ingress.yaml
+++ b/ingress/templates/deployment-ingress.yaml
@ -191,7 +191,7 @@ spec:
 {{- if .Values.network.host_namespace }}
      hostNetwork: true
 {{- end }}
-      dnsPolicy: "ClusterFirstWithHostNet"
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.server.timeout | default "60" }}
      initContainers:
 {{ tuple $envAll "ingress" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
--- a/ingress/templates/service-ingress-metrics-exporter.yaml
+++ b/ingress/templates/service-ingress-metrics-exporter.yaml
@ -35,4 +35,4 @@ spec:
    port: {{ .Values.endpoints.ingress_exporter.port.metrics.default }}
  selector:
 {{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}{{- end }}
-{{- end }}
+{{- end }}
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@ -82,6 +82,7 @@ pod:
        default: kubernetes.io/hostname
      weight:
        default: 10
+  dns_policy: "ClusterFirstWithHostNet"
  replicas:
    ingress: 1
    error_page: 1
--- a/kube-dns/templates/deployment-kube-dns.yaml
+++ b/kube-dns/templates/deployment-kube-dns.yaml
@ -178,7 +178,7 @@ spec:
              memory: 20Mi
          terminationMessagePath: /dev/termination-log
          terminationMessagePolicy: File
-      dnsPolicy: Default
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      restartPolicy: Always
      schedulerName: default-scheduler
      securityContext: {}
--- a/kube-dns/values.yaml
+++ b/kube-dns/values.yaml
@ -34,6 +34,7 @@ images:
      - image_repo_sync

 pod:
+  dns_policy: "Default"
  resources:
    enabled: false
    jobs:
--- a/libvirt/templates/daemonset-libvirt.yaml
+++ b/libvirt/templates/daemonset-libvirt.yaml
@ -55,7 +55,7 @@ spec:
      hostNetwork: true
      hostPID: true
      hostIPC: true
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      initContainers:
 {{ tuple $envAll "pod_dependency" $mounts_libvirt_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{ dict "envAll" $envAll | include "helm-toolkit.snippets.kubernetes_apparmor_loader_init_container" | indent 8 }}
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@ -111,6 +111,7 @@ pod:
        default: kubernetes.io/hostname
      weight:
        default: 10
+  dns_policy: "ClusterFirstWithHostNet"
  mounts:
    libvirt:
      init_container: null
--- a/openvswitch/templates/daemonset-ovs-db.yaml
+++ b/openvswitch/templates/daemonset-ovs-db.yaml
@ -47,7 +47,7 @@ spec:
 {{ dict "envAll" $envAll "application" "openvswitch_db_server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
      nodeSelector:
        {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }}
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      hostNetwork: true
      initContainers:
 {{ tuple $envAll "db" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
--- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml
+++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml
@ -47,7 +47,7 @@ spec:
 {{ dict "envAll" $envAll "application" "openvswitch_vswitchd" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
      nodeSelector:
        {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }}
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      hostNetwork: true
      initContainers:
 {{ tuple $envAll "vswitchd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
--- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml
@ -67,6 +67,7 @@ pod:
            add:
              - NET_ADMIN
          readOnlyRootFilesystem: true
+  dns_policy: "ClusterFirstWithHostNet"
  lifecycle:
    upgrades:
      daemonsets:
--- a/registry/templates/daemonset-registry-proxy.yaml
+++ b/registry/templates/daemonset-registry-proxy.yaml
@ -45,7 +45,7 @@ spec:
      serviceAccountName: {{ $serviceAccountName }}
      nodeSelector:
        {{ .Values.labels.registry.node_selector_key }}: {{ .Values.labels.registry.node_selector_value | quote }}
-      dnsPolicy: ClusterFirstWithHostNet
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      hostNetwork: true
      initContainers:
 {{ tuple $envAll "registry_proxy" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
--- a/registry/values.yaml
+++ b/registry/values.yaml
@ -98,6 +98,7 @@ pod:
        default: kubernetes.io/hostname
      weight:
        default: 10
+  dns_policy: "ClusterFirstWithHostNet"
  replicas:
    registry: 1
  lifecycle:
--- a/tiller/templates/deployment-tiller.yaml
+++ b/tiller/templates/deployment-tiller.yaml
@ -104,7 +104,7 @@ spec:
        resources: {}
        terminationMessagePath: /dev/termination-log
        terminationMessagePolicy: File
-      dnsPolicy: ClusterFirst
+      dnsPolicy: {{ .Values.pod.dns_policy }}
      restartPolicy: Always
      schedulerName: default-scheduler
      securityContext: {}
--- a/tiller/values.yaml
+++ b/tiller/values.yaml
@ -37,6 +37,7 @@ images:
      - image_repo_sync

 pod:
+  dns_policy: "ClusterFirst"
  security_context:
    tiller:
      pod:
--- a/tools/deployment/apparmor/050-libvirt.sh
+++ b/tools/deployment/apparmor/050-libvirt.sh
@ -173,4 +173,4 @@ helm upgrade --install libvirt ./libvirt \
 #NOTE: Validate Deployment info
 ./tools/deployment/common/wait-for-pods.sh openstack

-helm status libvirt
+helm status libvirt
--- a/tools/deployment/network-policy/050-prometheus.sh
+++ b/tools/deployment/network-policy/050-prometheus.sh
@ -68,4 +68,4 @@ helm upgrade --install prometheus ./prometheus \
 ./tools/deployment/common/wait-for-pods.sh osh-infra

 #NOTE: Validate Deployment info
-helm status prometheus
+helm status prometheus