add apiversion capabilities check to helm template (#2137)

Co-authored-by: Yusuke Kato <[email protected]>
vdaas · Jul 26, 2023 · dda49f0 · dda49f0
1 parent 38de959
commit dda49f0
Show file tree

Hide file tree

Showing 16 changed files with 125 additions and 5 deletions.
diff --git a/charts/vald/templates/agent/hpa.yaml b/charts/vald/templates/agent/hpa.yaml
@@ -15,7 +15,15 @@
 #
 {{- $agent := .Values.agent -}}
 {{- if and $agent.enabled $agent.hpa.enabled }}
+{{- if (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+apiVersion: autoscaling/v2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta2") }}
+apiVersion: autoscaling/v2beta2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+apiVersion: autoscaling/v2beta1
+{{- else }}
 apiVersion: autoscaling/v1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ $agent.name }}
@@ -33,6 +41,16 @@ spec:
     apiVersion: apps/v1
     kind: {{ $agent.kind }}
     name: {{ $agent.name }}
+{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2") (.Capabilities.APIVersions.Has "autoscaling/v2beta2") (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ $agent.hpa.targetCPUUtilizationPercentage }}
+{{ else }}
   targetCPUUtilizationPercentage: {{ $agent.hpa.targetCPUUtilizationPercentage }}
+{{- end }}
 status:
 {{- end }}
diff --git a/charts/vald/templates/agent/networkpolicy.yaml b/charts/vald/templates/agent/networkpolicy.yaml
@@ -18,8 +18,12 @@
 {{- $lb := .Values.gateway.lb -}}
 {{- $index := .Values.manager.index -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
-kind: NetworkPolicy
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: NetworkPolicy
 metadata:
   name: agent-allow
 spec:

diff --git a/charts/vald/templates/agent/pdb.yaml b/charts/vald/templates/agent/pdb.yaml
@@ -15,7 +15,11 @@
 #
 {{- $agent := .Values.agent -}}
 {{- if $agent.enabled }}
+{{- if (.Capabilities.APIVersions.Has "policy/v1beta1") }}
+apiVersion: policy/v1beta1
+{{- else }}
 apiVersion: policy/v1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ $agent.name }}

diff --git a/charts/vald/templates/discoverer/hpa.yaml b/charts/vald/templates/discoverer/hpa.yaml
@@ -15,7 +15,15 @@
 #
 {{- $discoverer := .Values.discoverer -}}
 {{- if $discoverer.hpa.enabled }}
+{{- if (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+apiVersion: autoscaling/v2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta2") }}
+apiVersion: autoscaling/v2beta2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+apiVersion: autoscaling/v2beta1
+{{- else }}
 apiVersion: autoscaling/v1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ $discoverer.name }}
@@ -33,6 +41,16 @@ spec:
     apiVersion: apps/v1
     kind: {{ $discoverer.kind }}
     name: {{ $discoverer.name }}
+{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2") (.Capabilities.APIVersions.Has "autoscaling/v2beta2") (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ $discoverer.hpa.targetCPUUtilizationPercentage }}
+{{- else }}
   targetCPUUtilizationPercentage: {{ $discoverer.hpa.targetCPUUtilizationPercentage }}
+{{- end }}
 status:
 {{- end }}
diff --git a/charts/vald/templates/discoverer/networkpolicy.yaml b/charts/vald/templates/discoverer/networkpolicy.yaml
@@ -18,8 +18,12 @@
 {{- $lb := .Values.gateway.lb -}}
 {{- $index := .Values.manager.index -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
-kind: NetworkPolicy
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: NetworkPolicy
 metadata:
   name: discoverer-allow
 spec:

diff --git a/charts/vald/templates/discoverer/pdb.yaml b/charts/vald/templates/discoverer/pdb.yaml
@@ -15,7 +15,11 @@
 #
 {{- $discoverer := .Values.discoverer -}}
 {{- if $discoverer.enabled }}
+{{- if (.Capabilities.APIVersions.Has "policy/v1beta1") }}
+apiVersion: policy/v1beta1
+{{- else }}
 apiVersion: policy/v1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ $discoverer.name }}

diff --git a/charts/vald/templates/gateway/filter/hpa.yaml b/charts/vald/templates/gateway/filter/hpa.yaml
@@ -15,7 +15,15 @@
 #
 {{- $gateway := .Values.gateway.filter -}}
 {{- if and $gateway.enabled $gateway.hpa.enabled }}
+{{- if (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+apiVersion: autoscaling/v2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta2") }}
+apiVersion: autoscaling/v2beta2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+apiVersion: autoscaling/v2beta1
+{{- else }}
 apiVersion: autoscaling/v1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ $gateway.name }}
@@ -33,6 +41,16 @@ spec:
     apiVersion: apps/v1
     kind: {{ $gateway.kind }}
     name: {{ $gateway.name }}
+{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2") (.Capabilities.APIVersions.Has "autoscaling/v2beta2") (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ $gateway.hpa.targetCPUUtilizationPercentage }}
+{{- else }}
   targetCPUUtilizationPercentage: {{ $gateway.hpa.targetCPUUtilizationPercentage }}
+{{- end }}
 status:
 {{- end }}
diff --git a/charts/vald/templates/gateway/filter/ing.yaml b/charts/vald/templates/gateway/filter/ing.yaml
@@ -15,7 +15,11 @@
 #
 {{- $gateway := .Values.gateway.filter -}}
 {{- if and $gateway.enabled $gateway.ingress.enabled }}
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
 kind: Ingress
 metadata:
   annotations:

diff --git a/charts/vald/templates/gateway/filter/networkpolicy.yaml b/charts/vald/templates/gateway/filter/networkpolicy.yaml
@@ -17,8 +17,12 @@
 {{- $lb := .Values.gateway.lb -}}
 {{- $filter := .Values.gateway.filter -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
-kind: NetworkPolicy
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: NetworkPolicy
 metadata:
   name: filter-allow
 spec:

diff --git a/charts/vald/templates/gateway/filter/pdb.yaml b/charts/vald/templates/gateway/filter/pdb.yaml
@@ -15,7 +15,11 @@
 #
 {{- $gateway := .Values.gateway.filter -}}
 {{- if $gateway.enabled }}
+{{- if (.Capabilities.APIVersions.Has "policy/v1beta1") }}
+apiVersion: policy/v1beta1
+{{- else }}
 apiVersion: policy/v1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ $gateway.name }}

diff --git a/charts/vald/templates/gateway/lb/hpa.yaml b/charts/vald/templates/gateway/lb/hpa.yaml
@@ -15,7 +15,15 @@
 #
 {{- $gateway := .Values.gateway.lb -}}
 {{- if and $gateway.enabled $gateway.hpa.enabled }}
+{{- if (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+apiVersion: autoscaling/v2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta2") }}
+apiVersion: autoscaling/v2beta2
+{{- else if (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+apiVersion: autoscaling/v2beta1
+{{- else }}
 apiVersion: autoscaling/v1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ $gateway.name }}
@@ -33,6 +41,16 @@ spec:
     apiVersion: apps/v1
     kind: {{ $gateway.kind }}
     name: {{ $gateway.name }}
+{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2") (.Capabilities.APIVersions.Has "autoscaling/v2beta2") (.Capabilities.APIVersions.Has "autoscaling/v2beta1") }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ $gateway.hpa.targetCPUUtilizationPercentage }}
+{{- else }}
   targetCPUUtilizationPercentage: {{ $gateway.hpa.targetCPUUtilizationPercentage }}
+{{- end }}
 status:
 {{- end }}
diff --git a/charts/vald/templates/gateway/lb/ing.yaml b/charts/vald/templates/gateway/lb/ing.yaml
@@ -15,7 +15,11 @@
 #
 {{- $gateway := .Values.gateway.lb -}}
 {{- if and $gateway.enabled $gateway.ingress.enabled }}
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
 kind: Ingress
 metadata:
   annotations:

diff --git a/charts/vald/templates/gateway/lb/networkpolicy.yaml b/charts/vald/templates/gateway/lb/networkpolicy.yaml
@@ -19,8 +19,12 @@
 {{- $filter := .Values.gateway.filter -}}
 {{- $discoverer := .Values.discoverer -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
-kind: NetworkPolicy
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: NetworkPolicy
 metadata:
   name: lb-allow
 spec:

diff --git a/charts/vald/templates/gateway/lb/pdb.yaml b/charts/vald/templates/gateway/lb/pdb.yaml
@@ -15,7 +15,11 @@
 #
 {{- $gateway := .Values.gateway.lb -}}
 {{- if $gateway.enabled }}
+{{- if (.Capabilities.APIVersions.Has "policy/v1beta1") }}
+apiVersion: policy/v1beta1
+{{- else }}
 apiVersion: policy/v1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ $gateway.name }}

diff --git a/charts/vald/templates/manager/index/networkpolicy.yaml b/charts/vald/templates/manager/index/networkpolicy.yaml
@@ -18,8 +18,12 @@
 {{- $discoverer := .Values.discoverer -}}
 {{- $index := .Values.manager.index -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
-kind: NetworkPolicy
+{{- if (.Capabilities.APIVersions.Has "networking.k8s.io/v1alpha1") }}
+apiVersion: networking.k8s.io/v1alpha1
+{{- else }}
 apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: NetworkPolicy
 metadata:
   name: index-allow
 spec:

diff --git a/charts/vald/templates/manager/index/pdb.yaml b/charts/vald/templates/manager/index/pdb.yaml
@@ -15,7 +15,11 @@
 #
 {{- $index := .Values.manager.index -}}
 {{- if $index.enabled }}
+{{- if (.Capabilities.APIVersions.Has "policy/v1beta1") }}
+apiVersion: policy/v1beta1
+{{- else }}
 apiVersion: policy/v1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ $index.name }}