Skip to content

Commit e68cc57

Browse files
starbopsAnton Donskoyw13915984028
authored
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]>
1 parent 3db1ecd commit e68cc57

File tree

10 files changed

+132
-35
lines changed

10 files changed

+132
-35
lines changed

‎charts/harvester-cloud-provider/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: kube-vip
33
repository: file://dependency_charts/kube-vip
4-
version: 0.4.2
5-
digest: sha256:bbbff44d39375203f4880e5a76f0d9705f25edc53f89532e8ef39cd23d9ca92b
6-
generated: "2023-06-07T17:47:05.632456+08:00"
4+
version: 0.6.4
5+
digest: sha256:857edf047d3e5011242eb3c05a940f966ce0d3d1100f00f6bf095177119842a0
6+
generated: "2024-12-19T17:51:27.827525+08:00"

‎charts/harvester-cloud-provider/Chart.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ version: 0.0.0-dev
2323
# This is the version number of the application being deployed. This version number should be
2424
# incremented each time you make changes to the application. Versions are not expected to
2525
# follow Semantic Versioning. They should reflect the version the application is using.
26-
appVersion: v0.2.0
26+
appVersion: v0.2.3
2727

2828
annotations:
2929
catalog.cattle.io/certified: rancher
3030
catalog.cattle.io/namespace: kube-system
31-
catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.27.0-0'
31+
catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.29.0-0'
3232
catalog.cattle.io/release-name: harvester-cloud-provider
3333
catalog.cattle.io/os: linux
34-
catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
34+
catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.10.0-0'
3535
catalog.cattle.io/ui-component: harvester-cloud-provider
3636
catalog.cattle.io/display-name: Harvester Cloud Provider
3737
# The version of the upstream chart or app. It prevents the unexpected "downgrade"
@@ -43,5 +43,6 @@ maintainers:
4343

4444
dependencies:
4545
- name: kube-vip
46-
version: 0.4.2
46+
condition: kube-vip.enabled
47+
version: 0.6.4
4748
repository: file://dependency_charts/kube-vip

‎charts/harvester-cloud-provider/charts/kube-vip-0.4.2.tgz

-2.6 KB
Binary file not shown.

‎charts/harvester-cloud-provider/charts/kube-vip-0.6.4.tgz

3.37 KB
Binary file not shown.

‎charts/harvester-cloud-provider/dependency_charts/kube-vip/Chart.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apiVersion: v2
2-
appVersion: v0.4.1
2+
appVersion: v0.8.4
33
description: A Helm chart for kube-vip
4+
icon: https://github.com/kube-vip/kube-vip/raw/main/kube-vip.png
5+
maintainers:
6+
- name: kube-vip
47
name: kube-vip
58
type: application
6-
version: 0.4.2
9+
version: 0.6.4

‎charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/_helpers.tpl

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,18 @@ Create the name of the service account to use
6363
{{- end }}
6464

6565
{{/*
66-
Global system default registry
66+
Convert string to boolean
6767
*/}}
68-
{{- define "system_default_registry" -}}
69-
{{- if .Values.global.cattle.systemDefaultRegistry -}}
70-
{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
68+
{{- define "kube-vip.toBool" -}}
69+
{{- if eq (lower (toString .)) "true" -}}
70+
{{- true -}}
71+
{{- else if eq (lower (toString .)) "false" -}}
72+
{{- false -}}
73+
{{- else if eq (lower (toString .)) "1" -}}
74+
{{- true -}}
75+
{{- else if eq (lower (toString .)) "0" -}}
76+
{{- false -}}
7177
{{- else -}}
72-
{{- "" -}}
78+
{{- default . false -}}
7379
{{- end -}}
7480
{{- end -}}

‎charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/daemonset.yaml

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,24 @@ spec:
1111
metadata:
1212
labels:
1313
{{- include "kube-vip.selectorLabels" . | nindent 8 }}
14+
{{- with .Values.extraLabels }}
15+
{{- toYaml . | nindent 8 }}
16+
{{- end }}
1417
spec:
1518
containers:
1619
- args:
1720
- manager
21+
{{- if kindIs "map" .Values.extraArgs }}
22+
{{- range $key, $value := .Values.extraArgs }}
23+
{{- if not (kindIs "invalid" $value) }}
24+
- --{{ $key }}={{ tpl ($value | toString) $ }}
25+
{{- else }}
26+
- --{{ $key }}
27+
{{- end }}
28+
{{- end }}
29+
{{- end }}
1830
env:
19-
{{- if eq .Values.env.cp_enable "true" }}
31+
{{- if eq (include "kube-vip.toBool" .Values.env.cp_enable) "true" }}
2032
- name: vip_address
2133
value: {{ required "A valid config.address required!" .Values.config.address}}
2234
{{- end }}
@@ -28,13 +40,34 @@ spec:
2840
value: {{ quote $value }}
2941
{{- end }}
3042
{{- end }}
31-
image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
43+
{{- with .Values.envValueFrom }}
44+
{{- range $k, $v := . }}
45+
{{- $name := $k }}
46+
{{- $value := $v }}
47+
- name: {{ quote $name }}
48+
valueFrom:
49+
{{- toYaml $value | nindent 14 }}
50+
{{- end }}
51+
{{- end }}
52+
{{- with .Values.envFrom }}
53+
envFrom:
54+
{{- toYaml . | nindent 8 }}
55+
{{- end }}
56+
image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
3257
imagePullPolicy: {{ .Values.image.pullPolicy }}
3358
name: kube-vip
3459
resources:
3560
{{- toYaml .Values.resources | nindent 10 }}
3661
securityContext:
3762
{{- toYaml .Values.securityContext | nindent 10 }}
63+
{{- with .Values.volumeMounts }}
64+
volumeMounts:
65+
{{- toYaml . | nindent 10 }}
66+
{{- end }}
67+
{{- with .Values.hostAliases }}
68+
hostAliases:
69+
{{- toYaml . | nindent 8 }}
70+
{{- end }}
3871
hostNetwork: true
3972
serviceAccountName: {{ include "kube-vip.name" . }}
4073
{{- with .Values.nodeSelector }}
@@ -45,7 +78,14 @@ spec:
4578
tolerations:
4679
{{- toYaml . | nindent 8 }}
4780
{{- end }}
81+
{{- with .Values.volumes }}
82+
volumes:
83+
{{- toYaml . | nindent 8 }}
84+
{{- end }}
4885
{{- with .Values.affinity }}
4986
affinity:
5087
{{- toYaml . | nindent 8 }}
5188
{{- end }}
89+
{{- if .Values.priorityClassName }}
90+
priorityClassName: {{ .Values.priorityClassName }}
91+
{{- end }}

‎charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
name: {{ include "kube-vip.name" . }}
1515
rules:
1616
- apiGroups: [""]
17-
resources: ["services", "services/status", "nodes"]
17+
resources: ["services", "services/status", "nodes", "endpoints"]
1818
verbs: ["list","get","watch", "update"]
1919
- apiGroups: ["coordination.k8s.io"]
2020
resources: ["leases"]

‎charts/harvester-cloud-provider/dependency_charts/kube-vip/values.yaml

Lines changed: 64 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Default values for kube-vip.
22
# This is a YAML-formatted file.
33
# Declare variables to be passed into your templates.
4-
54
image:
65
repository: ghcr.io/kube-vip/kube-vip
76
pullPolicy: IfNotPresent
87
# Overrides the image tag whose default is the chart appVersion.
9-
tag: "v0.4.1"
8+
# tag: "v0.7.0"
109

1110
config:
1211
address: ""
1312

13+
# Check https://kube-vip.io/docs/installation/flags/
1414
env:
1515
vip_interface: ""
1616
vip_arp: "true"
@@ -19,24 +19,55 @@ env:
1919
vip_cidr: "32"
2020
cp_enable: "false"
2121
svc_enable: "true"
22+
svc_election: "false"
2223
vip_leaderelection: "false"
2324

24-
imagePullSecrets: [ ]
25+
extraArgs: {}
26+
# Specify additional arguments to kube-vip
27+
# For example, to change the Prometheus HTTP server port, use the following:
28+
# prometheusHTTPServer: "0.0.0.0:2112"
29+
30+
envValueFrom: {}
31+
# Specify environment variables using valueFrom references (EnvVarSource)
32+
# For example we can use the IP address of the pod itself as a unique value for the routerID
33+
# bgp_routerid:
34+
# fieldRef:
35+
# fieldPath: status.podIP
36+
37+
envFrom: []
38+
# Specify an externally created Secret(s) or ConfigMap(s) to inject environment variables
39+
# For example an externally provisioned secret could contain the password for your upstream BGP router, such as
40+
#
41+
# apiVersion: v1
42+
# data:
43+
# bgp_peers: "<address:AS:password:multihop>"
44+
# kind: Secret
45+
# name: kube-vip
46+
# namespace: kube-system
47+
# type: Opaque
48+
#
49+
# - secretKeyRef:
50+
# name: kube-vip
51+
52+
extraLabels: {}
53+
# Specify extra labels to be added to DaemonSet (and therefore to Pods)
54+
55+
imagePullSecrets: []
2556
nameOverride: ""
2657
fullnameOverride: ""
2758

2859
serviceAccount:
2960
# Specifies whether a service account should be created
3061
create: true
3162
# Annotations to add to the service account
32-
annotations: { }
63+
annotations: {}
3364
# The name of the service account to use.
3465
# If not set and create is true, a name is generated using the fullname template
3566
name: ""
3667

37-
podAnnotations: { }
68+
podAnnotations: {}
3869

39-
podSecurityContext: { }
70+
podSecurityContext: {}
4071
# fsGroup: 2000
4172

4273
securityContext:
@@ -45,25 +76,43 @@ securityContext:
4576
- NET_ADMIN
4677
- NET_RAW
4778

48-
resources: { }
79+
resources: {}
4980
# We usually recommend not to specify default resources and to leave this as a conscious
5081
# choice for the user. This also increases chances charts run on environments with little
5182
# resources, such as Minikube. If you do want to specify resources, uncomment the following
5283
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
53-
# limits:
54-
# cpu: 100m
55-
# memory: 128Mi
56-
# requests:
57-
# cpu: 100m
58-
# memory: 128Mi
84+
# limits:
85+
# cpu: 100m
86+
# memory: 128Mi
87+
# requests:
88+
# cpu: 100m
89+
# memory: 128Mi
90+
91+
volumes: []
92+
# Specify additional volumes
93+
# - hostPath:
94+
# path: /etc/rancher/k3s/k3s.yaml
95+
# type: File
96+
# name: kubeconfig
97+
98+
volumeMounts: []
99+
# Specify additional volume mounts
100+
# - mountPath: /etc/kubernetes/admin.conf
101+
# name: kubeconfig
102+
103+
hostAliases: []
104+
# Specify additional host aliases
105+
# - hostnames:
106+
# - kubernetes
107+
# ip: 127.0.0.1
59108

60109
nodeSelector: {}
61110

62111
tolerations:
63112
- effect: NoSchedule
64113
key: node-role.kubernetes.io/control-plane
65114
operator: Exists
66-
affinity: { }
115+
affinity: {}
67116
# nodeAffinity:
68117
# requiredDuringSchedulingIgnoredDuringExecution:
69118
# nodeSelectorTerms:
@@ -74,6 +123,4 @@ affinity: { }
74123
# - key: node-role.kubernetes.io/control-plane
75124
# operator: Exists
76125

77-
global:
78-
cattle:
79-
systemDefaultRegistry: ""
126+
priorityClassName: ""

‎charts/harvester-cloud-provider/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ kube-vip:
8181
operator: Exists
8282
image:
8383
repository: rancher/mirrored-kube-vip-kube-vip-iptables
84-
tag: v0.6.0
84+
tag: v0.8.7
8585
env:
8686
vip_interface: ""
8787
vip_arp: "true"

0 commit comments

Comments
 (0)