From aad8a9c7f5d37e1ba3672614cfb294746cc70726 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 4 May 2022 14:49:56 +0200 Subject: [PATCH] feat: convert upgrade ds to initContainer, update all docs --- charts/clamav/README.md | 2 +- charts/kubeadm/README.md | 5 +++-- charts/kubezero-ci/README.md | 15 +++++++++------ charts/kubezero-istio-gateway/README.md | 2 +- charts/kubezero-logging/README.md | 6 +++--- charts/kubezero-storage/README.md | 6 +++--- charts/kubezero/README.md | 12 +++++++----- releases/v1.22/upgrade_cluster.sh | 8 ++++++-- 8 files changed, 33 insertions(+), 23 deletions(-) diff --git a/charts/clamav/README.md b/charts/clamav/README.md index 0663abb..c1a7d94 100644 --- a/charts/clamav/README.md +++ b/charts/clamav/README.md @@ -39,4 +39,4 @@ Kubernetes: `>= 1.18.0` | service.port | int | `3310` | The port to be used by the clamav service | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.9.1](https://github.com/norwoodj/helm-docs/releases/v1.9.1) diff --git a/charts/kubeadm/README.md b/charts/kubeadm/README.md index d461e46..e76c395 100644 --- a/charts/kubeadm/README.md +++ b/charts/kubeadm/README.md @@ -10,11 +10,11 @@ KubeZero Kubeadm cluster config | Name | Email | Url | | ---- | ------ | --- | -| Stefan Reimer | stefan@zero-downtime.net | | +| Stefan Reimer | | | ## Requirements -Kubernetes: `>= 1.22.0` +Kubernetes: `>= 1.20.0` ## Values @@ -25,6 +25,7 @@ Kubernetes: `>= 1.22.0` | addons.clusterBackup.enabled | bool | `false` | | | addons.clusterBackup.passwordFile | string | `""` | /etc/cloudbender/clusterBackup.passphrase | | addons.clusterBackup.repository | string | `""` | s3:https://s3.amazonaws.com/${CFN[ConfigBucket]}/k8s/${CLUSTERNAME}/clusterBackup | +| addons.external-dns.enabled | bool | `false` | | | api.apiAudiences | string | `"istio-ca"` | | | api.awsIamAuth.enabled | bool | `false` | | | api.awsIamAuth.kubeAdminRole | string | `"arn:aws:iam::000000000000:role/KubernetesNode"` | | diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index b17cbba..48089af 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -1,6 +1,6 @@ # kubezero-ci -![Version: 0.4.45](https://img.shields.io/badge/Version-0.4.45-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.4.50](https://img.shields.io/badge/Version-0.4.50-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things CI @@ -20,7 +20,7 @@ Kubernetes: `>= 1.20.0` |------------|------|---------| | https://aquasecurity.github.io/helm-charts/ | trivy | 0.4.12 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 | -| https://charts.jenkins.io | jenkins | 3.11.10 | +| https://charts.jenkins.io | jenkins | 3.12.0 | | https://dl.gitea.io/charts/ | gitea | 5.0.5 | | https://gocd.github.io/helm-chart | gocd | 1.40.8 | @@ -96,12 +96,12 @@ Kubernetes: `>= 1.20.0` | jenkins.controller.initContainerResources.requests.cpu | string | `"50m"` | | | jenkins.controller.initContainerResources.requests.memory | string | `"256Mi"` | | | jenkins.controller.installPlugins[0] | string | `"kubernetes:3580.v78271e5631dc"` | | -| jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:2.6"` | | -| jenkins.controller.installPlugins[2] | string | `"git:4.11.0"` | | -| jenkins.controller.installPlugins[3] | string | `"configuration-as-code:1414.v878271fc496f"` | | +| jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:2.7"` | | +| jenkins.controller.installPlugins[2] | string | `"git:4.11.1"` | | +| jenkins.controller.installPlugins[3] | string | `"configuration-as-code:1429.v09b_044a_c93de"` | | | jenkins.controller.installPlugins[4] | string | `"antisamy-markup-formatter:2.7"` | | | jenkins.controller.installPlugins[5] | string | `"prometheus:2.0.11"` | | -| jenkins.controller.installPlugins[6] | string | `"htmlpublisher:1.29"` | | +| jenkins.controller.installPlugins[6] | string | `"htmlpublisher:1.30"` | | | jenkins.controller.installPlugins[7] | string | `"build-discarder:60.v1747b0eb632a"` | | | jenkins.controller.installPlugins[8] | string | `"dark-theme:156.v6cf16af6f9ef"` | | | jenkins.controller.javaOpts | string | `"-XX:+UseContainerSupport -XX:+UseStringDeduplication -Dhudson.model.DirectoryBrowserSupport.CSP=\"sandbox allow-popups; default-src 'none'; img-src 'self' cdn.zero-downtime.net; style-src 'unsafe-inline';\""` | | @@ -114,6 +114,9 @@ Kubernetes: `>= 1.20.0` | jenkins.controller.tag | string | `"2.332.2-lts-jdk17-preview"` | | | jenkins.controller.testEnabled | bool | `false` | | | jenkins.enabled | bool | `false` | | +| jenkins.istio.agent.enabled | bool | `false` | | +| jenkins.istio.agent.gateway | string | `"istio-ingress/private-ingressgateway"` | | +| jenkins.istio.agent.url | string | `"jenkins-agent.example.com"` | | | jenkins.istio.enabled | bool | `false` | | | jenkins.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | jenkins.istio.url | string | `"jenkins.example.com"` | | diff --git a/charts/kubezero-istio-gateway/README.md b/charts/kubezero-istio-gateway/README.md index 76f6836..48cea9d 100644 --- a/charts/kubezero-istio-gateway/README.md +++ b/charts/kubezero-istio-gateway/README.md @@ -40,7 +40,7 @@ Kubernetes: `>= 1.20.0` | gateway.service.externalTrafficPolicy | string | `"Local"` | | | gateway.service.type | string | `"NodePort"` | | | proxyProtocol | bool | `true` | | -| telemetry.enabled | string | `"falser"` | | +| telemetry.enabled | bool | `false` | | ## Resources diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md index c9d8e6f..dee1c64 100644 --- a/charts/kubezero-logging/README.md +++ b/charts/kubezero-logging/README.md @@ -1,6 +1,6 @@ # kubezero-logging -![Version: 0.7.20](https://img.shields.io/badge/Version-0.7.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) KubeZero Umbrella Chart for complete EFK stack @@ -18,7 +18,7 @@ Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| | eck-operator | 1.6.0 | +| | eck-operator | 2.1.0 | | | fluent-bit | 0.19.23 | | | fluentd | 0.3.7 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | @@ -84,7 +84,7 @@ Kubernetes: `>= 1.18.0` | fluent-bit.daemonSetVolumes[0].hostPath.path | string | `"/var/log"` | | | fluent-bit.daemonSetVolumes[0].name | string | `"varlog"` | | | fluent-bit.enabled | bool | `false` | | -| fluent-bit.image.tag | string | `"1.9.2"` | | +| fluent-bit.image.tag | string | `"1.9.3"` | | | fluent-bit.luaScripts."kubezero.lua" | string | `"function nest_k8s_ns(tag, timestamp, record)\n if not record['kubernetes']['namespace_name'] then\n return 0, 0, 0\n end\n new_record = {}\n for key, val in pairs(record) do\n if key == 'kube' then\n new_record[key] = {}\n new_record[key][record['kubernetes']['namespace_name']] = record[key]\n else\n new_record[key] = record[key]\n end\n end\n return 1, timestamp, new_record\nend\n"` | | | fluent-bit.resources.limits.memory | string | `"64Mi"` | | | fluent-bit.resources.requests.cpu | string | `"20m"` | | diff --git a/charts/kubezero-storage/README.md b/charts/kubezero-storage/README.md index 102bd67..0accd2d 100644 --- a/charts/kubezero-storage/README.md +++ b/charts/kubezero-storage/README.md @@ -1,6 +1,6 @@ # kubezero-storage -![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things storage incl. AWS EBS/EFS, openEBS-lvm, gemini @@ -18,8 +18,8 @@ Kubernetes: `>= 1.20.0` | Repository | Name | Version | |------------|------|---------| -| | aws-ebs-csi-driver | 2.6.6 | -| | aws-efs-csi-driver | 2.2.3 | +| | aws-ebs-csi-driver | 2.6.7 | +| | aws-efs-csi-driver | 2.2.6 | | | gemini | 1.0.0 | | | lvm-localpv | 0.9.0 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md index 6febbfd..b812be1 100644 --- a/charts/kubezero/README.md +++ b/charts/kubezero/README.md @@ -1,6 +1,6 @@ # kubezero -![Version: 1.22.8-2](https://img.shields.io/badge/Version-1.22.8--2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.22.8-5](https://img.shields.io/badge/Version-1.22.8--5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero - Root App of Apps chart @@ -26,7 +26,7 @@ Kubernetes: `>= 1.20.0` |-----|------|---------|-------------| | HighAvailableControlplane | bool | `false` | | | addons.enabled | bool | `false` | | -| addons.targetRevision | string | `"0.5.0"` | | +| addons.targetRevision | string | `"0.5.1"` | | | argocd.enabled | bool | `false` | | | argocd.istio.enabled | bool | `false` | | | argocd.namespace | string | `"argocd"` | | @@ -36,10 +36,12 @@ Kubernetes: `>= 1.20.0` | cert-manager.targetRevision | string | `"0.9.0"` | | | istio-ingress.chart | string | `"kubezero-istio-gateway"` | | | istio-ingress.enabled | bool | `false` | | +| istio-ingress.gateway.service | object | `{}` | | | istio-ingress.namespace | string | `"istio-ingress"` | | | istio-ingress.targetRevision | string | `"0.8.0"` | | | istio-private-ingress.chart | string | `"kubezero-istio-gateway"` | | | istio-private-ingress.enabled | bool | `false` | | +| istio-private-ingress.gateway.service | object | `{}` | | | istio-private-ingress.namespace | string | `"istio-ingress"` | | | istio-private-ingress.targetRevision | string | `"0.8.0"` | | | istio.enabled | bool | `false` | | @@ -51,7 +53,7 @@ Kubernetes: `>= 1.20.0` | kubezero.server | string | `"https://kubernetes.default.svc"` | | | logging.enabled | bool | `false` | | | logging.namespace | string | `"logging"` | | -| logging.targetRevision | string | `"0.7.20"` | | +| logging.targetRevision | string | `"0.8.0"` | | | metrics.enabled | bool | `false` | | | metrics.istio.grafana | object | `{}` | | | metrics.istio.prometheus | object | `{}` | | @@ -63,7 +65,7 @@ Kubernetes: `>= 1.20.0` | storage.aws-ebs-csi-driver.enabled | bool | `false` | | | storage.aws-efs-csi-driver.enabled | bool | `false` | | | storage.enabled | bool | `false` | | -| storage.targetRevision | string | `"0.6.0"` | | +| storage.targetRevision | string | `"0.6.2"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.9.1](https://github.com/norwoodj/helm-docs/releases/v1.9.1) diff --git a/releases/v1.22/upgrade_cluster.sh b/releases/v1.22/upgrade_cluster.sh index 3450b7f..43d7508 100755 --- a/releases/v1.22/upgrade_cluster.sh +++ b/releases/v1.22/upgrade_cluster.sh @@ -29,14 +29,18 @@ spec: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule - containers: + initContainers: - name: kubezero-upgrade-${VERSION//.} image: busybox command: ["/bin/sh"] - args: ["-c", "[ -d /host/opt/cni/bin ] && mkdir -p /host/usr/libexec/cni && cp /host/opt/cni/bin/* /host/usr/libexec/cni ; sleep 300" ] + args: ["-x", "-c", "[ -d /host/opt/cni/bin ] && { mkdir -p /host/usr/libexec/cni && cp /host/opt/cni/bin/* /host/usr/libexec/cni; } || true" ] volumeMounts: - name: host mountPath: /host + containers: + - name: kubezero-upgrade-${VERSION//.}-wait + image: busybox + command: ["sleep", "3600"] volumes: - name: host hostPath: