Merge branch 'main' into main

kube-vip · Jan 6, 2025 · e37ca1e · e37ca1e
2 parents 6f3ab70 + f256955
commit e37ca1e
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -61,3 +61,4 @@ jobs:
         uses: helm/[email protected]
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_SKIP_EXISTING: "true"
diff --git a/charts/kube-vip-cloud-provider/Chart.yaml b/charts/kube-vip-cloud-provider/Chart.yaml
@@ -15,12 +15,12 @@ type: application
 # 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.2
+version: 0.2.5
 
 # 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.0.4
+appVersion: v0.0.10
 
 icon: https://github.com/kube-vip/kube-vip/raw/main/kube-vip.png
 

diff --git a/charts/kube-vip-cloud-provider/templates/configmap.yaml b/charts/kube-vip-cloud-provider/templates/configmap.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.cm.data }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "kube-vip-cloud-provider.name" . }}
+  namespace: {{ .Release.Namespace }}
+data:
+{{- range $key, $value := .Values.cm.data }}
+  {{ $key }}: {{ $value | quote }}
+{{- end }}
+{{- end }}
diff --git a/charts/kube-vip-cloud-provider/templates/deployment.yaml b/charts/kube-vip-cloud-provider/templates/deployment.yaml
@@ -19,10 +19,29 @@ spec:
             - --leader-elect-resource-name=kube-vip-cloud-controller
           image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           name: {{ include "kube-vip-cloud-provider.name" . }}
+          env:
+          - name: KUBEVIP_NAMESPACE
+            value: {{ .Release.Namespace }}
+          - name: KUBEVIP_CONFIG_MAP
+            value: {{ .Values.configMapName | default (include "kube-vip-cloud-provider.name" .) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            runAsNonRoot: true
+            runAsUser: 65532
+            runAsGroup: 65532
+            seccompProfile:
+              type: RuntimeDefault
       serviceAccountName: {{ include "kube-vip-cloud-provider.name" . }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
@@ -31,3 +50,6 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+      {{- end }}
diff --git a/charts/kube-vip-cloud-provider/values.yaml b/charts/kube-vip-cloud-provider/values.yaml
@@ -8,7 +8,25 @@ image:
   repository: kubevip/kube-vip-cloud-provider
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v0.0.4"
+  # tag: "v0.0.4"
+
+## Cloud Provider ConfigMap
+## CIDR blocks , IP ranges [start address - end address]
+## Multiple pools by CIDR per Namespace, Multiple IP ranges per Namespace (handles overlapping ranges)
+
+# cm:
+#   data:
+#     cidr-default: 192.168.0.200/29
+#     range-development: 192.168.0.210-192.168.0.219
+#     cidr-finance: 192.168.0.220/29,192.168.0.230/29
+#     cidr-global: 192.168.0.240/29
+
+cm:
+  data: {}
+
+# By default, kube-vip-cloud-provider will use a configMap automatically generated from .Values.cm.data.
+# If .Values.configMapName is defined, it will use that configMap instead, which you must create yourself.
+configMapName: ""
 
 resources:
   requests:
@@ -18,6 +36,17 @@ resources:
     cpu: 100m
     memory: 128Mi
 
+# Node selector allows you to constrain a Pod to be scheduled on nodes with specific labels.
+# If specified, the nodeSelector will be applied alongside the defined affinity rules.
+# If left empty, the nodeSelector will not be applied, and the Pod can be scheduled on any node.
+
+# nodeSelector:
+#   disktype: ssd
+#   nodepool: system
+#   critical-addons-only: "true"
+
+nodeSelector: {}
+
 tolerations:
   - key: node-role.kubernetes.io/master
     effect: NoSchedule
@@ -37,3 +66,5 @@ affinity:
           matchExpressions:
             - key: node-role.kubernetes.io/master
               operator: Exists
+
+priorityClassName: ""
diff --git a/charts/kube-vip/Chart.yaml b/charts/kube-vip/Chart.yaml
@@ -15,12 +15,12 @@ type: application
 # 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.6.2
+version: 0.6.4
 
 # 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.8.0"
+appVersion: "v0.8.4"
 
 icon: https://github.com/kube-vip/kube-vip/raw/main/kube-vip.png
 

diff --git a/charts/kube-vip/templates/daemonset.yaml b/charts/kube-vip/templates/daemonset.yaml
@@ -60,6 +60,14 @@ spec:
           {{- 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 }}
@@ -70,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/kube-vip/values.yaml b/charts/kube-vip/values.yaml
@@ -88,6 +88,24 @@ resources: {}
   #   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:
@@ -108,4 +126,6 @@ affinity: {}
 podMonitor:
   enabled: false
   labels: {}
-  annotations: {}
+  annotations: {}
+
+priorityClassName: ""