diff --git a/charts/kubezero-storage/aws-efs-csi-driver.patch b/charts/kubezero-storage/aws-efs-csi-driver.patch index 7651590..4ce03fc 100644 --- a/charts/kubezero-storage/aws-efs-csi-driver.patch +++ b/charts/kubezero-storage/aws-efs-csi-driver.patch @@ -1,7 +1,7 @@ -diff -tuNr charts/aws-efs-csi-driver.orig/templates/controller-deployment.yaml charts/aws-efs-csi-driver/templates/controller-deployment.yaml ---- charts/aws-efs-csi-driver.orig/templates/controller-deployment.yaml 2022-10-11 20:57:20.000000000 +0200 -+++ charts/aws-efs-csi-driver/templates/controller-deployment.yaml 2022-10-12 22:40:48.100658738 +0200 -@@ -69,9 +73,14 @@ +diff -rtuN charts/aws-efs-csi-driver.orig/templates/controller-deployment.yaml charts/aws-efs-csi-driver/templates/controller-deployment.yaml +--- charts/aws-efs-csi-driver.orig/templates/controller-deployment.yaml 2023-08-23 11:32:48.964952023 +0000 ++++ charts/aws-efs-csi-driver/templates/controller-deployment.yaml 2023-08-23 11:32:48.968285371 +0000 +@@ -76,9 +76,14 @@ - name: AWS_USE_FIPS_ENDPOINT value: "true" {{- end }} @@ -16,7 +16,7 @@ diff -tuNr charts/aws-efs-csi-driver.orig/templates/controller-deployment.yaml c ports: - name: healthz containerPort: {{ .Values.controller.healthPort }} -@@ -122,6 +131,13 @@ +@@ -137,6 +142,13 @@ volumes: - name: socket-dir emptyDir: {} @@ -30,3 +30,14 @@ diff -tuNr charts/aws-efs-csi-driver.orig/templates/controller-deployment.yaml c {{- with .Values.controller.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} +diff -rtuN charts/aws-efs-csi-driver.orig/templates/node-daemonset.yaml charts/aws-efs-csi-driver/templates/node-daemonset.yaml +--- charts/aws-efs-csi-driver.orig/templates/node-daemonset.yaml 2023-08-23 11:32:48.964952023 +0000 ++++ charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2023-08-23 11:35:11.605635352 +0000 +@@ -51,6 +51,7 @@ + {{- with .Values.node.dnsConfig }} + dnsConfig: {{- toYaml . | nindent 8 }} + {{- end }} ++ hostNetwork: true + serviceAccountName: {{ .Values.node.serviceAccount.name }} + priorityClassName: system-node-critical + {{- with .Values.node.tolerations }} diff --git a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml index acaebe2..2b69f0c 100644 --- a/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml +++ b/charts/kubezero-storage/charts/aws-efs-csi-driver/templates/node-daemonset.yaml @@ -51,6 +51,7 @@ spec: {{- with .Values.node.dnsConfig }} dnsConfig: {{- toYaml . | nindent 8 }} {{- end }} + hostNetwork: true serviceAccountName: {{ .Values.node.serviceAccount.name }} priorityClassName: system-node-critical {{- with .Values.node.tolerations }} diff --git a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json index 038266d..34d017b 100644 --- a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json +++ b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json @@ -58,7 +58,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "46fc905d5b2981642043088ac7902ea50db2903e", + "version": "a10227e04218679b5e0e1d50784a4251bf3bdaf3", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { diff --git a/charts/kubezero-storage/lvm-localpv.patch b/charts/kubezero-storage/lvm-localpv.patch index 086c782..a9b1ae3 100644 --- a/charts/kubezero-storage/lvm-localpv.patch +++ b/charts/kubezero-storage/lvm-localpv.patch @@ -1,6 +1,6 @@ -diff -tuNr charts/lvm-localpv.orig/templates/lvm-controller.yaml charts/lvm-localpv/templates/lvm-controller.yaml ---- charts/lvm-localpv.orig/templates/lvm-controller.yaml 2022-01-11 13:47:28.717133358 +0100 -+++ charts/lvm-localpv/templates/lvm-controller.yaml 2022-01-11 13:49:49.160473040 +0100 +diff -rtuN charts/lvm-localpv.orig/templates/lvm-controller.yaml charts/lvm-localpv/templates/lvm-controller.yaml +--- charts/lvm-localpv.orig/templates/lvm-controller.yaml 2023-08-23 11:28:23.687014522 +0000 ++++ charts/lvm-localpv/templates/lvm-controller.yaml 2023-08-23 11:28:23.690347871 +0000 @@ -72,16 +72,6 @@ mountPath: /var/lib/csi/sockets/pluginproxy/ resources: diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 99ab1fb..120bc27 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -80,7 +80,7 @@ istio-private-ingress: metrics: enabled: false namespace: monitoring - targetRevision: 0.9.2 + targetRevision: 0.9.4 istio: grafana: {} prometheus: {} diff --git a/scripts/lib-update.sh b/scripts/lib-update.sh index bcf66c7..c0c7c47 100755 --- a/scripts/lib-update.sh +++ b/scripts/lib-update.sh @@ -29,18 +29,52 @@ login_ecr_public() { --password-stdin public.ecr.aws } -patch_chart() { - CHART=$1 +_get_extract_chart() { + local CHART=$1 + local VERSION=$2 - VERSION=$(yq eval '.dependencies[] | select(.name=="'$CHART'") | .version' Chart.yaml) + local REPO=$(yq eval '.dependencies[] | select(.name=="'$CHART'") | .repository' Chart.yaml) + local URL=$(curl -s $REPO/index.yaml | yq '.entries."'$CHART'".[] | select (.version=="'$VERSION'") | .urls[0]') + wget -qO - $URL | tar xfvz - -C charts +} + +patch_chart() { + local CHART=$1 + local VERSION=$(yq eval '.dependencies[] | select(.name=="'$CHART'") | .version' Chart.yaml) rm -rf charts/$CHART - tar xfvz charts/$CHART-$VERSION.tgz -C charts && rm charts/$CHART-$VERSION.tgz + + # If helm already pulled the chart archive use it + if [ -f charts/$CHART-$VERSION.tgz ]; then + tar xfvz charts/$CHART-$VERSION.tgz -C charts && rm charts/$CHART-$VERSION.tgz + + # otherwise parse Chart.yaml and get it + else + _get_extract_chart $CHART $VERSION + fi # diff -tuNr charts/aws-node-termination-handler.orig charts/aws-node-termination-handler > nth.patch [ -r $CHART.patch ] && patch -p0 -i $CHART.patch --no-backup-if-mismatch || true } +patch_rebase() { + local CHART=$1 + local VERSION=$(yq eval '.dependencies[] | select(.name=="'$CHART'") | .version' Chart.yaml) + + rm -rf charts/$CHART + _get_extract_chart $CHART $VERSION + cp -r charts/$CHART charts/$CHART.orig + + patch -p0 -i $CHART.patch --no-backup-if-mismatch +} + +patch_create() { + local CHART=$1 + + diff -rtuN charts/$CHART.orig charts/$CHART > $CHART.patch + rm -rf charts/$CHART.orig +} + update_docs() { helm-docs }