From 1504533fb13493de213d21316ca686f911b5de8d Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Fri, 19 Jul 2019 16:32:11 +0200 Subject: [PATCH] Change DaemonSet apiVersion to apps/v1 DaemonSet apiVersion: extensions/v1beta1 is deprecated starting from Kubernetes v1.8.0-alpha.3 [0]. DaemonSet uses apiVersion: apps/v1 starting from v1.9.0 [1]. We run Kubernetes v1.13.4 and up at the moment. [0] - https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.8.md [1] - https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md Change-Id: Ic286e208836cf17be09fa78ba4d0f45084ae47fb --- divingbell/templates/daemonset-apparmor.yaml | 5 ++++- divingbell/templates/daemonset-apt.yaml | 5 ++++- divingbell/templates/daemonset-ethtool.yaml | 5 ++++- divingbell/templates/daemonset-exec.yaml | 5 ++++- divingbell/templates/daemonset-limits.yaml | 5 ++++- divingbell/templates/daemonset-mounts.yaml | 5 ++++- divingbell/templates/daemonset-perm.yaml | 5 ++++- divingbell/templates/daemonset-sysctl.yaml | 5 ++++- divingbell/templates/daemonset-uamlite.yaml | 5 ++++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/divingbell/templates/daemonset-apparmor.yaml b/divingbell/templates/daemonset-apparmor.yaml index 7f19f9c..40f0581 100644 --- a/divingbell/templates/daemonset-apparmor.yaml +++ b/divingbell/templates/daemonset-apparmor.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-apt.yaml b/divingbell/templates/daemonset-apt.yaml index d539d10..9b3d3ff 100644 --- a/divingbell/templates/daemonset-apt.yaml +++ b/divingbell/templates/daemonset-apt.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-ethtool.yaml b/divingbell/templates/daemonset-ethtool.yaml index fe9b67c..75e84fb 100644 --- a/divingbell/templates/daemonset-ethtool.yaml +++ b/divingbell/templates/daemonset-ethtool.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-exec.yaml b/divingbell/templates/daemonset-exec.yaml index 4621057..87a585c 100644 --- a/divingbell/templates/daemonset-exec.yaml +++ b/divingbell/templates/daemonset-exec.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-limits.yaml b/divingbell/templates/daemonset-limits.yaml index ac13e49..e142e3d 100644 --- a/divingbell/templates/daemonset-limits.yaml +++ b/divingbell/templates/daemonset-limits.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-mounts.yaml b/divingbell/templates/daemonset-mounts.yaml index 22b1db5..e88951c 100644 --- a/divingbell/templates/daemonset-mounts.yaml +++ b/divingbell/templates/daemonset-mounts.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-perm.yaml b/divingbell/templates/daemonset-perm.yaml index f39896b..30cd7f6 100644 --- a/divingbell/templates/daemonset-perm.yaml +++ b/divingbell/templates/daemonset-perm.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-sysctl.yaml b/divingbell/templates/daemonset-sysctl.yaml index 805ebc3..1030e9d 100644 --- a/divingbell/templates/daemonset-sysctl.yaml +++ b/divingbell/templates/daemonset-sysctl.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: diff --git a/divingbell/templates/daemonset-uamlite.yaml b/divingbell/templates/daemonset-uamlite.yaml index a078932..31f1a78 100644 --- a/divingbell/templates/daemonset-uamlite.yaml +++ b/divingbell/templates/daemonset-uamlite.yaml @@ -20,7 +20,7 @@ {{- $envAll := index . 2 }} {{- with $envAll }} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ $daemonset }} @@ -28,6 +28,9 @@ metadata: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ 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: metadata: labels: