Bump cloud provider 0.2.7 (#317)

* chore: bump kube-vip to v0.8.7 (#316) * chore: bump kube-vip to v0.8.7 - Chart version: 0.6.4 - App version: v0.8.7 Signed-off-by: Zespre Chang <[email protected]> * fix(harvester-cloud-provider): allow to disable kube-vip Signed-off-by: Zespre Chang <[email protected]> Co-authored-by: Anton Donskoy <[email protected]> Co-authored-by: Jian Wang <[email protected]> --------- Signed-off-by: Zespre Chang <[email protected]> Co-authored-by: Anton Donskoy <[email protected]> Co-authored-by: Jian Wang <[email protected]> * chore: bump cloud-provider to 0.2.7 - chart version: 0.2.7 - app version: v0.2.4 Signed-off-by: Zespre Chang <[email protected]> --------- Signed-off-by: Zespre Chang <[email protected]> Co-authored-by: Anton Donskoy <[email protected]> Co-authored-by: Jian Wang <[email protected]>
harvester · Dec 24, 2024 · 28c40d1 · 28c40d1
1 parent 04c58d3
commit 28c40d1
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 35 deletions.
diff --git a/charts/harvester-cloud-provider/Chart.lock b/charts/harvester-cloud-provider/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: kube-vip
   repository: file://dependency_charts/kube-vip
-  version: 0.4.2
-digest: sha256:bbbff44d39375203f4880e5a76f0d9705f25edc53f89532e8ef39cd23d9ca92b
-generated: "2023-06-07T17:47:05.632456+08:00"
+  version: 0.6.4
+digest: sha256:857edf047d3e5011242eb3c05a940f966ce0d3d1100f00f6bf095177119842a0
+generated: "2024-12-19T17:51:27.827525+08:00"
diff --git a/charts/harvester-cloud-provider/Chart.yaml b/charts/harvester-cloud-provider/Chart.yaml
@@ -18,12 +18,12 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.6
+version: 0.2.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v0.2.0
+appVersion: v0.2.4
 
 annotations:
   catalog.cattle.io/certified: rancher
@@ -43,5 +43,6 @@ maintainers:
 
 dependencies:
   - name: kube-vip
-    version: 0.4.2
+    condition: kube-vip.enabled
+    version: 0.6.4
     repository: file://dependency_charts/kube-vip
diff --git a/charts/harvester-cloud-provider/charts/kube-vip-0.4.2.tgz b/charts/harvester-cloud-provider/charts/kube-vip-0.4.2.tgz
diff --git a/charts/harvester-cloud-provider/charts/kube-vip-0.6.4.tgz b/charts/harvester-cloud-provider/charts/kube-vip-0.6.4.tgz
diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/Chart.yaml b/charts/harvester-cloud-provider/dependency_charts/kube-vip/Chart.yaml
@@ -1,6 +1,9 @@
 apiVersion: v2
-appVersion: v0.4.1
+appVersion: v0.8.4
 description: A Helm chart for kube-vip
+icon: https://github.com/kube-vip/kube-vip/raw/main/kube-vip.png
+maintainers:
+- name: kube-vip
 name: kube-vip
 type: application
-version: 0.4.2
+version: 0.6.4
diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/_helpers.tpl b/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/_helpers.tpl
@@ -63,12 +63,18 @@ Create the name of the service account to use
 {{- end }}
 
 {{/*
-Global system default registry
+Convert string to boolean
 */}}
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- define "kube-vip.toBool" -}}
+{{- if eq (lower (toString .)) "true" -}}
+{{- true -}}
+{{- else if eq (lower (toString .)) "false" -}}
+{{- false -}}
+{{- else if eq (lower (toString .)) "1" -}}
+{{- true -}}
+{{- else if eq (lower (toString .)) "0" -}}
+{{- false -}}
 {{- else -}}
-{{- "" -}}
+{{- default . false -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/daemonset.yaml b/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/daemonset.yaml
@@ -11,12 +11,24 @@ spec:
     metadata:
       labels:
         {{- include "kube-vip.selectorLabels" . | nindent 8 }}
+      {{- with .Values.extraLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       containers:
       - args:
           - manager
+          {{- if kindIs "map" .Values.extraArgs }}
+          {{- range $key, $value := .Values.extraArgs }}
+          {{- if not (kindIs "invalid" $value) }}
+          - --{{ $key }}={{ tpl ($value | toString) $ }}
+          {{- else }}
+          - --{{ $key }}
+          {{- end }}
+          {{- end }}
+          {{- end }}
         env:
-          {{- if eq .Values.env.cp_enable "true" }}
+          {{- if eq (include "kube-vip.toBool" .Values.env.cp_enable) "true" }}
           - name: vip_address
             value: {{ required "A valid config.address required!" .Values.config.address}}
           {{- end }}
@@ -28,13 +40,34 @@ spec:
             value: {{ quote $value }}
           {{- end }}
         {{- end }}
-        image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+        {{- with .Values.envValueFrom }}
+          {{- range $k, $v := . }}
+            {{- $name := $k }}
+            {{- $value := $v }}
+          - name: {{ quote $name }}
+            valueFrom:
+              {{- toYaml $value | nindent 14 }}
+          {{- end }}
+        {{- end }}
+      {{- with .Values.envFrom }}
+        envFrom:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: kube-vip
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
+        {{- with .Values.volumeMounts }}
+        volumeMounts:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
+      {{- with .Values.hostAliases }}
+      hostAliases:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       hostNetwork: true
       serviceAccountName: {{ include "kube-vip.name" . }}
       {{- with .Values.nodeSelector }}
@@ -45,7 +78,14 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+      {{- end }}
diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/rbac.yaml b/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/rbac.yaml
@@ -14,7 +14,7 @@ metadata:
   name: {{ include "kube-vip.name" . }}
 rules:
   - apiGroups: [""]
-    resources: ["services", "services/status", "nodes"]
+    resources: ["services", "services/status", "nodes", "endpoints"]
     verbs: ["list","get","watch", "update"]
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]

diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/values.yaml b/charts/harvester-cloud-provider/dependency_charts/kube-vip/values.yaml
@@ -1,16 +1,16 @@
 # Default values for kube-vip.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-
 image:
   repository: ghcr.io/kube-vip/kube-vip
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v0.4.1"
+  # tag: "v0.7.0"
 
 config:
   address: ""
 
+# Check https://kube-vip.io/docs/installation/flags/
 env:
   vip_interface: ""
   vip_arp: "true"
@@ -19,24 +19,55 @@ env:
   vip_cidr: "32"
   cp_enable: "false"
   svc_enable: "true"
+  svc_election: "false"
   vip_leaderelection: "false"
 
-imagePullSecrets: [ ]
+extraArgs: {}
+  # Specify additional arguments to kube-vip
+  # For example, to change the Prometheus HTTP server port, use the following:
+  # prometheusHTTPServer: "0.0.0.0:2112"
+
+envValueFrom: {}
+  # Specify environment variables using valueFrom references (EnvVarSource)
+  # For example we can use the IP address of the pod itself as a unique value for the routerID
+  # bgp_routerid:
+  #  fieldRef:
+  #    fieldPath: status.podIP
+
+envFrom: []
+  # Specify an externally created Secret(s) or ConfigMap(s) to inject environment variables
+  # For example an externally provisioned secret could contain the password for your upstream BGP router, such as
+  #
+  # apiVersion: v1
+  # data:
+  #   bgp_peers: "<address:AS:password:multihop>"
+  # kind: Secret
+  #   name: kube-vip
+  #   namespace: kube-system
+  # type: Opaque
+  #
+  # - secretKeyRef:
+  #    name: kube-vip
+
+extraLabels: {}
+  # Specify extra labels to be added to DaemonSet (and therefore to Pods)
+
+imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
   # Annotations to add to the service account
-  annotations: { }
+  annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: { }
+podAnnotations: {}
 
-podSecurityContext: { }
+podSecurityContext: {}
 # fsGroup: 2000
 
 securityContext:
@@ -45,25 +76,43 @@ securityContext:
       - NET_ADMIN
       - NET_RAW
 
-resources: { }
+resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-# limits:
-#   cpu: 100m
-#   memory: 128Mi
-# requests:
-#   cpu: 100m
-#   memory: 128Mi
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+volumes: []
+  # Specify additional volumes
+  #   - hostPath:
+  #       path: /etc/rancher/k3s/k3s.yaml
+  #       type: File
+  #     name: kubeconfig
+
+volumeMounts: []
+  # Specify additional volume mounts
+  # - mountPath: /etc/kubernetes/admin.conf
+  #   name: kubeconfig
+
+hostAliases: []
+  # Specify additional host aliases
+  # - hostnames:
+  #     - kubernetes
+  #   ip: 127.0.0.1
 
 nodeSelector: {}
 
 tolerations:
   - effect: NoSchedule
     key: node-role.kubernetes.io/control-plane
     operator: Exists
-affinity: { }
+affinity: {}
   # nodeAffinity:
   #   requiredDuringSchedulingIgnoredDuringExecution:
   #     nodeSelectorTerms:
@@ -74,6 +123,4 @@ affinity: { }
   #       - key: node-role.kubernetes.io/control-plane
   #         operator: Exists
 
-global:
-  cattle:
-    systemDefaultRegistry: ""
+priorityClassName: ""
diff --git a/charts/harvester-cloud-provider/values.yaml b/charts/harvester-cloud-provider/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: rancher/harvester-cloud-provider
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v0.2.2
+  tag: v0.2.4
 
 cloudConfigPath: "/etc/kubernetes/cloud-config"
 
@@ -81,7 +81,7 @@ kube-vip:
     operator: Exists
   image:
     repository: rancher/mirrored-kube-vip-kube-vip-iptables
-    tag: v0.6.0
+    tag: v0.8.7
   env:
     vip_interface: ""
     vip_arp: "true"