Update to Gardener v1.13.2 and cleanup old migration paths. (#166)

* Update to Gardener v1.13.2 and cleanup old migration paths. * Fix linting issue. * More updates. * Remove resource manager override.
metal-stack · Mar 31, 2021 · 563b8e7 · 563b8e7
1 parent 4c91d7e
commit 563b8e7
Show file tree

Hide file tree

Showing 36 changed files with 159 additions and 685 deletions.
diff --git a/charts/internal/machine-controller-manager/seed/templates/clusterrole.yaml b/charts/internal/machine-controller-manager/seed/templates/clusterrole.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -22,4 +21,3 @@ rules:
   - events
   verbs:
   - "*"
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/templates/clusterrolebinding.yaml b/charts/internal/machine-controller-manager/seed/templates/clusterrolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -19,4 +18,3 @@ subjects:
 - kind: ServiceAccount
   name: machine-controller-manager
   namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/templates/configmap-monitoring.yaml b/charts/internal/machine-controller-manager/seed/templates/configmap-monitoring.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -51,4 +50,3 @@ data:
   dashboard_operators: |
     machine-controller-manager-dashboard.json: |-
 {{ .Files.Get "mcm-monitoring-dashboard.json" | indent 6 }}
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/templates/deployment.yaml b/charts/internal/machine-controller-manager/seed/templates/deployment.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -122,4 +121,3 @@ spec:
       - name: machine-controller-manager
         secret:
           secretName: machine-controller-manager
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/clusterrole.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/clusterrole.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/clusterrolebinding.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/clusterrolebinding.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/configmap-monitoring.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/configmap-monitoring.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/deployment.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/deployment.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/service.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/service.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/serviceaccount.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/serviceaccount.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/legacy/vpa.yaml b/charts/internal/machine-controller-manager/seed/templates/legacy/vpa.yaml
diff --git a/charts/internal/machine-controller-manager/seed/templates/service.yaml b/charts/internal/machine-controller-manager/seed/templates/service.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: v1
 kind: Service
@@ -18,4 +17,3 @@ spec:
   selector:
     app: kubernetes
     role: machine-controller-manager
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/templates/serviceaccount.yaml b/charts/internal/machine-controller-manager/seed/templates/serviceaccount.yaml
@@ -1,8 +1,6 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: machine-controller-manager
   namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/templates/vpa.yaml b/charts/internal/machine-controller-manager/seed/templates/vpa.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 {{- if .Values.vpa.enabled }}
 apiVersion: autoscaling.k8s.io/v1beta2
 kind: VerticalPodAutoscaler
@@ -13,4 +12,3 @@ spec:
   updatePolicy:
     updateMode: {{ .Values.vpa.updatePolicy.updateMode | quote }}
 {{- end }}
-{{- end }}
diff --git a/charts/internal/machine-controller-manager/seed/values.yaml b/charts/internal/machine-controller-manager/seed/values.yaml
@@ -19,5 +19,3 @@ vpa:
   enabled: true
   updatePolicy:
     updateMode: "Auto"
-
-deployOOT: false
diff --git a/...al/machine-controller-manager/shoot/templates/clusterrole-machine-controller-manager.yaml b/...al/machine-controller-manager/shoot/templates/clusterrole-machine-controller-manager.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -61,4 +60,3 @@ rules:
   - patch
   - update
   - watch
-{{- end }}
diff --git a/...ine-controller-manager/shoot/templates/clusterrolebinding-machine-controller-manager.yaml b/...ine-controller-manager/shoot/templates/clusterrolebinding-machine-controller-manager.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.deployOOT }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -11,4 +10,3 @@ roleRef:
 subjects:
 - kind: User
   name: system:machine-controller-manager
-{{- end }}