Merge "Change DaemonSet apiVersion to apps/v1"

This commit is contained in:
Zuul 2019-08-12 21:36:19 +00:00 committed by Gerrit Code Review
commit 8e523b029c
9 changed files with 36 additions and 9 deletions

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -20,7 +20,7 @@
{{- $envAll := index . 2 }} {{- $envAll := index . 2 }}
{{- with $envAll }} {{- with $envAll }}
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ $daemonset }} name: {{ $daemonset }}
@ -28,6 +28,9 @@ metadata:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:
{{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} {{ tuple $envAll $daemonset | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
selector:
matchLabels:
{{ list $envAll .Chart.Name $daemonset | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
template: template:
metadata: metadata:
labels: labels: