refactor: consolidate keyvault-flexvolume addon spec (Azure#3389)

penggu · Oct 28, 2020 · 333f689 · 333f689
1 parent dcabf10
commit 333f689
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 749 deletions.
diff --git a/parts/k8s/addons/1.16/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml b/parts/k8s/addons/1.16/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml
diff --git a/parts/k8s/addons/1.18/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml b/parts/k8s/addons/1.18/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml
diff --git a/parts/k8s/addons/1.19/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml b/parts/k8s/addons/1.19/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml
diff --git a/...addons-keyvault-flexvolume-installer.yaml → parts/k8s/addons/keyvault-flexvolume.yaml b/...addons-keyvault-flexvolume-installer.yaml → parts/k8s/addons/keyvault-flexvolume.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1
+apiVersion: {{if IsKubernetesVersionGe "1.16.0"}}apps/v1{{else}}extensions/v1beta1{{end}}
 kind: DaemonSet
 metadata:
   labels:
@@ -10,17 +10,21 @@ metadata:
 spec:
   updateStrategy:
     type: RollingUpdate
+{{- if IsKubernetesVersionGe "1.16.0"}}
   selector:
     matchLabels:
       app: keyvault-flexvolume
+{{- end}}
   template:
     metadata:
       labels:
         app: keyvault-flexvolume
         kubernetes.io/cluster-service: "true"
         addonmanager.kubernetes.io/mode: Reconcile
+{{- if IsKubernetesVersionGe "1.17.0"}}
       annotations:
         cluster-autoscaler.kubernetes.io/daemonset-pod: "true"
+{{- end}}
     spec:
       priorityClassName: system-cluster-critical
       tolerations:

diff --git a/parts/k8s/addons/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml b/parts/k8s/addons/kubernetesmasteraddons-keyvault-flexvolume-installer.yaml
diff --git a/pkg/engine/const.go b/pkg/engine/const.go
@@ -216,8 +216,8 @@ const (
 	blobfuseFlexVolumeAddonDestinationFilename     string = "blobfuse-flexvolume.yaml"
 	smbFlexVolumeAddonSourceFilename               string = "kubernetesmasteraddons-smb-flexvolume-installer.yaml"
 	smbFlexVolumeAddonDestinationFilename          string = "smb-flexvolume-installer.yaml"
-	keyvaultFlexVolumeAddonSourceFilename          string = "kubernetesmasteraddons-keyvault-flexvolume-installer.yaml"
-	keyvaultFlexVolumeAddonDestinationFilename     string = "keyvault-flexvolume-installer.yaml"
+	keyvaultFlexVolumeAddonSourceFilename          string = "keyvault-flexvolume.yaml"
+	keyvaultFlexVolumeAddonDestinationFilename     string = "keyvault-flexvolume.yaml"
 	dashboardAddonSourceFilename                   string = "kubernetes-dashboard.yaml"
 	dashboardAddonDestinationFilename              string = "kubernetes-dashboard.yaml"
 	reschedulerAddonSourceFilename                 string = "kube-rescheduler.yaml"