From f962cea71baf0bf394eb5cdb11bb34612dbd6ce5 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 4 Aug 2021 15:28:47 +0200 Subject: [PATCH] fix: fix typo --- charts/kubezero/bootstrap.sh | 8 -------- charts/kubezero/templates/storage.yaml | 2 +- scripts/upgrade_cert-manager.sh | 21 --------------------- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100755 scripts/upgrade_cert-manager.sh diff --git a/charts/kubezero/bootstrap.sh b/charts/kubezero/bootstrap.sh index 06c6623..7686c09 100755 --- a/charts/kubezero/bootstrap.sh +++ b/charts/kubezero/bootstrap.sh @@ -198,14 +198,6 @@ function metrics-pre() { } -########### -# Logging # -########### -function logging-post() { - kubectl annotate --overwrite namespace logging 'iam.amazonaws.com/permitted=.*ElasticSearchSnapshots.*' -} - - ## MAIN ## if [ $1 == "deploy" ]; then for t in ${ARTIFACTS[@]}; do diff --git a/charts/kubezero/templates/storage.yaml b/charts/kubezero/templates/storage.yaml index c28062f..d601a08 100644 --- a/charts/kubezero/templates/storage.yaml +++ b/charts/kubezero/templates/storage.yaml @@ -1,6 +1,6 @@ {{- define "storage-values" }} -{{- with index .Values "cert-manager" "storageClass" }} +{{- with index .Values "storage" "storageClass" }} storageClass: {{- . | toYaml | nindent 2 }} {{- end }} diff --git a/scripts/upgrade_cert-manager.sh b/scripts/upgrade_cert-manager.sh deleted file mode 100755 index b753113..0000000 --- a/scripts/upgrade_cert-manager.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -kubectl get -o yaml \ - --all-namespaces \ - issuer,clusterissuer,certificates,certificaterequests > cert-manager-backup.yaml - -kubectl cert-manager convert --output-version cert-manager.io/v1 -f cert-manager-backup.yaml > cert-manager-v1.yaml - -./bootstrap.sh delete cert-manager $1 - -kubectl delete crd certificaterequests.cert-manager.io -kubectl delete crd certificates.cert-manager.io -kubectl delete crd challenges.acme.cert-manager.io -kubectl delete crd clusterissuers.cert-manager.io -kubectl delete crd issuers.cert-manager.io -kubectl delete crd orders.acme.cert-manager.io - -./bootstrap.sh crds cert-manager $1 -./bootstrap.sh deploy cert-manager $1 - -kubectl apply -f cert-manager-v1.yaml