ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 25 Packages Projects Releases Wiki Activity

cert-manager version bump, local-path-provisioner fixes

Browse Source
This commit is contained in:
Stefan Reimer 2020-11-30 11:34:44 +00:00
parent 59ff3cb015
commit b0f53257ac
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero-cert-manager/Chart.yaml
View File

@ -15,7 +15,7 @@ dependencies:
version: ">= 0.1.3" version: ">= 0.1.3"
repository: https://zero-down-time.github.io/kubezero/ repository: https://zero-down-time.github.io/kubezero/
- name: cert-manager - name: cert-manager
version: 1.0.4 version: 1.1.0
repository: https://charts.jetstack.io repository: https://charts.jetstack.io
condition: cert-manager.enabled condition: cert-manager.enabled
kubeVersion: ">= 1.16.0" kubeVersion: ">= 1.16.0"

8
charts/kubezero/bootstrap.sh
View File

@ -53,7 +53,9 @@ function chart_location() {
# make sure namespace exists prior to calling helm as the create-namespace options doesn't work # make sure namespace exists prior to calling helm as the create-namespace options doesn't work
function create_ns() { function create_ns() {
local namespace=$1 local namespace=$1
if [ "$namespace" != "kube-system" ]; then
kubectl get ns $namespace || kubectl create ns $namespace kubectl get ns $namespace || kubectl create ns $namespace
fi
} }
@ -66,8 +68,8 @@ function delete_ns() {
# Extract crds via helm calls and apply delta=crds only # Extract crds via helm calls and apply delta=crds only
function _crds() { function _crds() {
helm template $(chart_location $chart) --namespace $namespace --name-template $release --skip-crds > $TMPDIR/helm-no-crds.yaml helm template $(chart_location $chart) --namespace $namespace --name-template $release --skip-crds --set ${release}.installCRDs=false > $TMPDIR/helm-no-crds.yaml
helm template $(chart_location $chart) --namespace $namespace --name-template $release --include-crds > $TMPDIR/helm-crds.yaml helm template $(chart_location $chart) --namespace $namespace --name-template $release --include-crds --set ${release}.installCRDs=true > $TMPDIR/helm-crds.yaml
diff -e $TMPDIR/helm-no-crds.yaml $TMPDIR/helm-crds.yaml | head -n-1 | tail -n+2 > $TMPDIR/crds.yaml diff -e $TMPDIR/helm-no-crds.yaml $TMPDIR/helm-crds.yaml | head -n-1 | tail -n+2 > $TMPDIR/crds.yaml
kubectl apply -f $TMPDIR/crds.yaml kubectl apply -f $TMPDIR/crds.yaml
} }
@ -113,6 +115,8 @@ function _helm() {
# Delete dedicated namespace if not kube-system # Delete dedicated namespace if not kube-system
[ $action == "delete" ] && delete_ns $namespace [ $action == "delete" ] && delete_ns $namespace
fi fi
return 0
} }

9
charts/kubezero/templates/local-path-provisioner.yaml
View File

@ -1,4 +1,13 @@
{{- define "local-path-provisioner-values" }} {{- define "local-path-provisioner-values" }}
local-path-provisioner:
{{- with index .Values "local-path-provisioner" "storageClass" }}
storageClass:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with index .Values "local-path-provisioner" "nodePathMap" }}
nodePathMap:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }} {{- end }}
{{- define "local-path-provisioner-argo" }} {{- define "local-path-provisioner-argo" }}