From 10f9fde0877fce2bcaf237d3cbeb281f2d44f240 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 21 Jun 2022 20:35:35 +0200 Subject: [PATCH] feat: 1.22.8-10 and other modules latest vesions --- .../templates/KubeletConfiguration.yaml | 3 +-- charts/kubezero-addons/README.md | 4 ++-- charts/kubezero-auth/Chart.yaml | 8 +++++-- charts/kubezero-auth/README.md | 8 ++++++- .../templates/keycloak/keycloak.yaml | 21 +++++++++++++--- .../templates/keycloak/operator.yaml | 24 +++++++++---------- charts/kubezero-auth/update.sh | 10 ++++---- charts/kubezero-auth/values.yaml | 14 +++++++++++ charts/kubezero-ci/README.md | 8 +++---- charts/kubezero-ci/values.yaml | 8 +++---- charts/kubezero-istio-gateway/README.md | 4 ++-- charts/kubezero-istio/README.md | 8 +++---- charts/kubezero-logging/Chart.yaml | 2 +- charts/kubezero-logging/README.md | 6 ++++- charts/kubezero-logging/values.yaml | 5 ++++ charts/kubezero-redis/README.md | 12 +++++----- charts/kubezero/Chart.yaml | 2 +- charts/kubezero/README.md | 10 ++++---- charts/kubezero/values.yaml | 8 +++---- releases/v1.22/migrate_argo.py | 2 +- releases/v1.22/upgrade_cluster.sh | 3 +++ scripts/decode_jwt.sh | 3 +++ 22 files changed, 114 insertions(+), 59 deletions(-) create mode 100644 scripts/decode_jwt.sh diff --git a/charts/kubeadm/templates/KubeletConfiguration.yaml b/charts/kubeadm/templates/KubeletConfiguration.yaml index 2e32def..8fdfd48 100644 --- a/charts/kubeadm/templates/KubeletConfiguration.yaml +++ b/charts/kubeadm/templates/KubeletConfiguration.yaml @@ -4,8 +4,7 @@ kind: KubeletConfiguration failSwapOn: false cgroupDriver: cgroupfs logging: - # We already have syslog-ng logging json - # format: json + format: json hairpinMode: hairpin-veth {{- if .Values.systemd }} resolvConf: /run/systemd/resolve/resolv.conf diff --git a/charts/kubezero-addons/README.md b/charts/kubezero-addons/README.md index 3bcc91f..f9113f9 100644 --- a/charts/kubezero-addons/README.md +++ b/charts/kubezero-addons/README.md @@ -1,6 +1,6 @@ # kubezero-addons -![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.22.8](https://img.shields.io/badge/AppVersion-v1.22.8-informational?style=flat-square) +![Version: 0.5.5](https://img.shields.io/badge/Version-0.5.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.22.8](https://img.shields.io/badge/AppVersion-v1.22.8-informational?style=flat-square) KubeZero umbrella chart for various optional cluster addons @@ -18,7 +18,7 @@ Kubernetes: `>= 1.20.0` | Repository | Name | Version | |------------|------|---------| -| | aws-node-termination-handler | 0.18.3 | +| | aws-node-termination-handler | 0.18.5 | | https://kubernetes-sigs.github.io/external-dns/ | external-dns | 1.7.1 | # MetalLB diff --git a/charts/kubezero-auth/Chart.yaml b/charts/kubezero-auth/Chart.yaml index 8ff519a..0fcc6ab 100644 --- a/charts/kubezero-auth/Chart.yaml +++ b/charts/kubezero-auth/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: kubezero-auth description: KubeZero umbrella chart for all things Authentication and Identity management type: application -version: 0.1.4 -appVersion: 18.0.0 +version: 0.2.2 +appVersion: 18.0.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -16,4 +16,8 @@ dependencies: - name: kubezero-lib version: ">= 0.1.4" repository: https://cdn.zero-downtime.net/charts/ + - name: postgresql + version: 11.6.7 + repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled kubeVersion: ">= 1.20.0" diff --git a/charts/kubezero-auth/README.md b/charts/kubezero-auth/README.md index c947fa4..ea2b288 100644 --- a/charts/kubezero-auth/README.md +++ b/charts/kubezero-auth/README.md @@ -1,6 +1,6 @@ # kubezero-auth -![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 18.0.0](https://img.shields.io/badge/AppVersion-18.0.0-informational?style=flat-square) +![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 18.0.1](https://img.shields.io/badge/AppVersion-18.0.1-informational?style=flat-square) KubeZero umbrella chart for all things Authentication and Identity management @@ -19,6 +19,7 @@ Kubernetes: `>= 1.20.0` | Repository | Name | Version | |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | +| https://charts.bitnami.com/bitnami | postgresql | 11.6.7 | # Keycloak @@ -40,3 +41,8 @@ https://github.com/keycloak/keycloak/tree/main/operator | keycloak.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | keycloak.istio.url | string | `""` | | | keycloak.metrics.enabled | bool | `false` | | +| postgresql.auth.database | string | `"keycloak"` | | +| postgresql.auth.username | string | `"keycloak"` | | +| postgresql.enabled | bool | `false` | | +| postgresql.primary.persistence.size | string | `"1Gi"` | | +| postgresql.readReplicas.replicaCount | int | `0` | | diff --git a/charts/kubezero-auth/templates/keycloak/keycloak.yaml b/charts/kubezero-auth/templates/keycloak/keycloak.yaml index 1a13d12..77c4238 100644 --- a/charts/kubezero-auth/templates/keycloak/keycloak.yaml +++ b/charts/kubezero-auth/templates/keycloak/keycloak.yaml @@ -6,13 +6,27 @@ metadata: namespace: {{ .Release.Namespace }} spec: instances: 1 - # Wait for next release, already fixed - #disableDefaultIngress: true + disableDefaultIngress: true + serverConfiguration: - name: cache value: local + {{- if .Values.postgresql.enabled }} - name: db - value: dev-mem + value: postgres + - name: db-url-host + value: {{ template "kubezero-lib.fullname" . }}-postgresql + - name: db-username + value: keycloak + - name: db-password + secret: + name: {{ template "kubezero-lib.fullname" . }}-postgresql + key: password + {{- else }} + # Fallback to local file within the pod - dev ONLY !! + - name: db + value: dev-file + {{- end }} - name: hostname-strict-https value: "false" - name: proxy @@ -20,6 +34,7 @@ spec: - name: http-enabled value: "true" + #hostname: INSECURE-DISABLE hostname: {{ default "keycloak" .Values.keycloak.istio.url }} diff --git a/charts/kubezero-auth/templates/keycloak/operator.yaml b/charts/kubezero-auth/templates/keycloak/operator.yaml index 90ee8c0..e3d4779 100644 --- a/charts/kubezero-auth/templates/keycloak/operator.yaml +++ b/charts/kubezero-auth/templates/keycloak/operator.yaml @@ -4,20 +4,20 @@ apiVersion: v1 kind: ServiceAccount metadata: annotations: - app.quarkus.io/build-timestamp: 2022-04-21 - 08:45:16 +0000 + app.quarkus.io/build-timestamp: 2022-06-17 - 10:24:55 +0000 labels: + app.kubernetes.io/version: 18.0.1 app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 18.0.0 name: keycloak-operator --- apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/build-timestamp: 2022-04-21 - 08:45:16 +0000 + app.quarkus.io/build-timestamp: 2022-06-17 - 10:24:55 +0000 labels: app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 18.0.0 + app.kubernetes.io/version: 18.0.1 name: keycloak-operator spec: ports: @@ -26,7 +26,7 @@ spec: targetPort: 8080 selector: app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 18.0.0 + app.kubernetes.io/version: 18.0.1 type: ClusterIP --- apiVersion: rbac.authorization.k8s.io/v1 @@ -179,24 +179,24 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/build-timestamp: 2022-04-21 - 08:45:16 +0000 + app.quarkus.io/build-timestamp: 2022-06-17 - 10:24:55 +0000 labels: + app.kubernetes.io/version: 18.0.1 app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 18.0.0 name: keycloak-operator spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/version: 18.0.1 app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 18.0.0 template: metadata: annotations: - app.quarkus.io/build-timestamp: 2022-04-21 - 08:45:16 +0000 + app.quarkus.io/build-timestamp: 2022-06-17 - 10:24:55 +0000 labels: + app.kubernetes.io/version: 18.0.1 app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 18.0.0 spec: containers: - env: @@ -205,8 +205,8 @@ spec: fieldRef: fieldPath: metadata.namespace - name: OPERATOR_KEYCLOAK_IMAGE - value: quay.io/keycloak/keycloak:18.0.0 - image: quay.io/keycloak/keycloak-operator:18.0.0 + value: quay.io/keycloak/keycloak:18.0.1 + image: quay.io/keycloak/keycloak-operator:18.0.1 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/charts/kubezero-auth/update.sh b/charts/kubezero-auth/update.sh index 1c6e61c..dbc2a47 100755 --- a/charts/kubezero-auth/update.sh +++ b/charts/kubezero-auth/update.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# https://www.keycloak.org/operator/installation + set -ex helm dep update @@ -6,9 +9,8 @@ helm dep update # Operator VERSION=$(yq eval '.appVersion' Chart.yaml) -wget -q -O crds/keycloak.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/${VERSION}/kubernetes/keycloaks.k8s.keycloak.org-v1.yml - wget -q -O crds/keycloak-realmimports.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/${VERSION}/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml - -wget -q -O templates/keycloak/operator.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/${VERSION}/kubernetes/kubernetes.yml +wget -O crds/keycloak.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/${VERSION}/kubernetes/keycloaks.k8s.keycloak.org-v1.yml +wget -O crds/keycloak-realmimports.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/${VERSION}/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml +wget -O templates/keycloak/operator.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/${VERSION}/kubernetes/kubernetes.yml patch -i keycloak.patch -p0 --no-backup-if-mismatch diff --git a/charts/kubezero-auth/values.yaml b/charts/kubezero-auth/values.yaml index 86261d9..1ac2737 100644 --- a/charts/kubezero-auth/values.yaml +++ b/charts/kubezero-auth/values.yaml @@ -8,3 +8,17 @@ keycloak: metrics: enabled: false + +postgresql: + enabled: false + + auth: + username: keycloak + database: keycloak + + primary: + persistence: + size: 1Gi + + readReplicas: + replicaCount: 0 diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index 2484dfd..8edecb2 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -54,7 +54,7 @@ Kubernetes: `>= 1.20.0` | gitea.gitea.metrics.enabled | bool | `false` | | | gitea.gitea.metrics.serviceMonitor.enabled | bool | `false` | | | gitea.image.rootless | bool | `true` | | -| gitea.image.tag | string | `"1.16.6"` | | +| gitea.image.tag | string | `"1.16.8"` | | | gitea.istio.enabled | bool | `false` | | | gitea.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | gitea.istio.url | string | `"git.example.com"` | | @@ -95,9 +95,9 @@ Kubernetes: `>= 1.20.0` | jenkins.controller.initContainerResources.limits.memory | string | `"1024Mi"` | | | 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.7"` | | -| jenkins.controller.installPlugins[2] | string | `"git:4.11.1"` | | +| jenkins.controller.installPlugins[0] | string | `"kubernetes:3600.v144b_cd192ca_a_"` | | +| jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:581.v0c46fa_697ffd"` | | +| jenkins.controller.installPlugins[2] | string | `"git:4.11.3"` | | | 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"` | | diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index a6d23b2..b75a6cc 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -17,7 +17,7 @@ gitea: enabled: false image: - tag: 1.16.6 + tag: 1.16.8 rootless: true securityContext: @@ -114,9 +114,9 @@ jenkins: numToKeepStr: "10" installPlugins: - - kubernetes:3580.v78271e5631dc - - workflow-aggregator:2.7 - - git:4.11.1 + - kubernetes:3600.v144b_cd192ca_a_ + - workflow-aggregator:581.v0c46fa_697ffd + - git:4.11.3 - configuration-as-code:1429.v09b_044a_c93de - antisamy-markup-formatter:2.7 - prometheus:2.0.11 diff --git a/charts/kubezero-istio-gateway/README.md b/charts/kubezero-istio-gateway/README.md index 48cea9d..f27820a 100644 --- a/charts/kubezero-istio-gateway/README.md +++ b/charts/kubezero-istio-gateway/README.md @@ -1,6 +1,6 @@ # kubezero-istio-gateway -![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) +![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero Umbrella Chart for Istio gateways @@ -21,7 +21,7 @@ Kubernetes: `>= 1.20.0` | Repository | Name | Version | |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | -| https://istio-release.storage.googleapis.com/charts | gateway | 1.13.3 | +| https://istio-release.storage.googleapis.com/charts | gateway | 1.13.5 | ## Values diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md index fc57ab5..350e38d 100644 --- a/charts/kubezero-istio/README.md +++ b/charts/kubezero-istio/README.md @@ -1,6 +1,6 @@ # kubezero-istio -![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) +![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero Umbrella Chart for Istio @@ -22,8 +22,8 @@ Kubernetes: `>= 1.20.0` |------------|------|---------| | | kiali-server | 1.38.1 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | -| https://istio-release.storage.googleapis.com/charts | base | 1.13.3 | -| https://istio-release.storage.googleapis.com/charts | istiod | 1.13.3 | +| https://istio-release.storage.googleapis.com/charts | base | 1.13.5 | +| https://istio-release.storage.googleapis.com/charts | istiod | 1.13.5 | ## Values @@ -32,7 +32,7 @@ Kubernetes: `>= 1.20.0` | global.defaultPodDisruptionBudget.enabled | bool | `false` | | | global.logAsJson | bool | `true` | | | global.priorityClassName | string | `"system-cluster-critical"` | | -| global.tag | string | `"1.13.3-distroless"` | | +| global.tag | string | `"1.13.5-distroless"` | | | istiod.meshConfig.accessLogEncoding | string | `"JSON"` | | | istiod.meshConfig.accessLogFile | string | `"/dev/stdout"` | | | istiod.meshConfig.tcpKeepalive.interval | string | `"60s"` | | diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 9a8a38d..f13a022 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.8.0 +version: 0.8.1 appVersion: 1.6.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md index dee1c64..830e3a8 100644 --- a/charts/kubezero-logging/README.md +++ b/charts/kubezero-logging/README.md @@ -1,6 +1,6 @@ # kubezero-logging -![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) +![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-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 @@ -81,8 +81,12 @@ Kubernetes: `>= 1.18.0` | fluent-bit.config.service | string | `"[SERVICE]\n Flush {{ .Values.config.flushInterval }}\n Daemon Off\n Log_Level {{ .Values.config.logLevel }}\n Parsers_File parsers.conf\n Parsers_File custom_parsers.conf\n HTTP_Server On\n HTTP_Listen 0.0.0.0\n HTTP_Port {{ .Values.service.port }}\n Health_Check On\n"` | | | fluent-bit.daemonSetVolumeMounts[0].mountPath | string | `"/var/log"` | | | fluent-bit.daemonSetVolumeMounts[0].name | string | `"varlog"` | | +| fluent-bit.daemonSetVolumeMounts[1].mountPath | string | `"/var/lib/containers/logs"` | | +| fluent-bit.daemonSetVolumeMounts[1].name | string | `"newlog"` | | | fluent-bit.daemonSetVolumes[0].hostPath.path | string | `"/var/log"` | | | fluent-bit.daemonSetVolumes[0].name | string | `"varlog"` | | +| fluent-bit.daemonSetVolumes[1].hostPath.path | string | `"/var/lib/containers/logs"` | | +| fluent-bit.daemonSetVolumes[1].name | string | `"newlog"` | | | fluent-bit.enabled | bool | `false` | | | 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"` | | diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 41d6e78..58cedb6 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -396,7 +396,12 @@ fluent-bit: - name: varlog hostPath: path: /var/log + - name: newlog + hostPath: + path: /var/lib/containers/logs daemonSetVolumeMounts: - name: varlog mountPath: /var/log + - name: newlog + mountPath: /var/lib/containers/logs diff --git a/charts/kubezero-redis/README.md b/charts/kubezero-redis/README.md index 4cba1a0..a173887 100644 --- a/charts/kubezero-redis/README.md +++ b/charts/kubezero-redis/README.md @@ -1,6 +1,6 @@ # kubezero-redis -![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero Umbrella Chart for Redis HA @@ -10,17 +10,17 @@ KubeZero Umbrella Chart for Redis HA | Name | Email | Url | | ---- | ------ | --- | -| Quarky9 | | | +| Stefan Reimer | | | ## Requirements -Kubernetes: `>= 1.18.0` +Kubernetes: `>= 1.20.0` | Repository | Name | Version | |------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.3 | -| https://charts.bitnami.com/bitnami | redis | 15.5.4 | -| https://charts.bitnami.com/bitnami | redis-cluster | 6.3.9 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | +| https://charts.bitnami.com/bitnami | redis | 16.10.1 | +| https://charts.bitnami.com/bitnami | redis-cluster | 7.6.1 | ## Values diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml index c4ac4e8..cfe0737 100644 --- a/charts/kubezero/Chart.yaml +++ b/charts/kubezero/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero description: KubeZero - Root App of Apps chart type: application -version: 1.22.8-8 +version: 1.22.8-10 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md index c817beb..49ef132 100644 --- a/charts/kubezero/README.md +++ b/charts/kubezero/README.md @@ -1,6 +1,6 @@ # kubezero -![Version: 1.22.8-8](https://img.shields.io/badge/Version-1.22.8--8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.22.8-10](https://img.shields.io/badge/Version-1.22.8--10-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.3"` | | +| addons.targetRevision | string | `"0.5.5"` | | | argocd.enabled | bool | `false` | | | argocd.istio.enabled | bool | `false` | | | argocd.namespace | string | `"argocd"` | | @@ -38,7 +38,7 @@ Kubernetes: `>= 1.20.0` | istio-ingress.enabled | bool | `false` | | | istio-ingress.gateway.service | object | `{}` | | | istio-ingress.namespace | string | `"istio-ingress"` | | -| istio-ingress.targetRevision | string | `"0.8.0"` | | +| istio-ingress.targetRevision | string | `"0.8.1"` | | | istio-private-ingress.chart | string | `"kubezero-istio-gateway"` | | | istio-private-ingress.enabled | bool | `false` | | | istio-private-ingress.gateway.service | object | `{}` | | @@ -46,14 +46,14 @@ Kubernetes: `>= 1.20.0` | istio-private-ingress.targetRevision | string | `"0.8.0"` | | | istio.enabled | bool | `false` | | | istio.namespace | string | `"istio-system"` | | -| istio.targetRevision | string | `"0.8.0"` | | +| istio.targetRevision | string | `"0.8.1"` | | | kubezero.defaultTargetRevision | string | `"*"` | | | kubezero.gitSync | object | `{}` | | | kubezero.repoURL | string | `"https://cdn.zero-downtime.net/charts"` | | | kubezero.server | string | `"https://kubernetes.default.svc"` | | | logging.enabled | bool | `false` | | | logging.namespace | string | `"logging"` | | -| logging.targetRevision | string | `"0.8.0"` | | +| logging.targetRevision | string | `"0.8.1"` | | | metrics.enabled | bool | `false` | | | metrics.istio.grafana | object | `{}` | | | metrics.istio.prometheus | object | `{}` | | diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index a04976c..86002fb 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -8,7 +8,7 @@ HighAvailableControlplane: false addons: enabled: false - targetRevision: 0.5.3 + targetRevision: 0.5.5 network: enabled: false @@ -31,13 +31,13 @@ storage: istio: enabled: false namespace: istio-system - targetRevision: 0.8.0 + targetRevision: 0.8.1 istio-ingress: enabled: false chart: kubezero-istio-gateway namespace: istio-ingress - targetRevision: 0.8.0 + targetRevision: 0.8.1 gateway: service: {} @@ -60,7 +60,7 @@ metrics: logging: enabled: false namespace: logging - targetRevision: 0.8.0 + targetRevision: 0.8.1 argocd: enabled: false diff --git a/releases/v1.22/migrate_argo.py b/releases/v1.22/migrate_argo.py index 9af175b..c60f6d7 100755 --- a/releases/v1.22/migrate_argo.py +++ b/releases/v1.22/migrate_argo.py @@ -15,7 +15,7 @@ parser = argparse.ArgumentParser(description="Update Route53 entries") parser.add_argument( "--version", dest="version", - default="1.22.8-8", + default="1.22.8-10", action="store", required=False, help="Update KubeZero version", diff --git a/releases/v1.22/upgrade_cluster.sh b/releases/v1.22/upgrade_cluster.sh index 6170191..e5cebf6 100755 --- a/releases/v1.22/upgrade_cluster.sh +++ b/releases/v1.22/upgrade_cluster.sh @@ -110,6 +110,9 @@ while true; do done kubectl delete pod kubezero-upgrade-${VERSION//.} -n kube-system +# Fix backup cron for proper version +kubectl set image cronjob/kubezero-backup kubezero-admin=public.ecr.aws/zero-downtime/kubezero-admin:${VERSION} -n kube-system + # Now lets rolling restart bunch of ds to make sure they picked up the changes for ds in calico-node kube-multus-ds kube-proxy ebs-csi-node; do kubectl rollout restart daemonset/$ds -n kube-system diff --git a/scripts/decode_jwt.sh b/scripts/decode_jwt.sh new file mode 100644 index 0000000..26c7380 --- /dev/null +++ b/scripts/decode_jwt.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +jq -R 'split(".") | .[1] | @base64d | fromjson' <<< $(cat $1)