From f28370845de1e69ec5748db2723eda8f50312afb Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 16 May 2022 17:55:49 +0200
Subject: [PATCH] feat: tag kubezero image with major version, minor tweaks

---
 Makefile                                 | 3 +++
 charts/kubezero-istio-gateway/Chart.yaml | 2 +-
 charts/kubezero-istio/Chart.yaml         | 2 +-
 docs/inf1-test.yaml                      | 2 +-
 releases/v1.22/README.md                 | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 77e1c10..dabe8ed 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ REGISTRY := public.ecr.aws/zero-downtime
 IMAGE := kubezero-admin
 REGION := us-east-1
 
+# Also tag as Kubernetes major version
+EXTRA_TAGS = $(shell echo $(TAG) | awk -F '.' '{ print $$1 "." $$2 }')
+
 include .ci/podman.mk
 
 update-charts:
diff --git a/charts/kubezero-istio-gateway/Chart.yaml b/charts/kubezero-istio-gateway/Chart.yaml
index 1233a0a..3bf12e0 100644
--- a/charts/kubezero-istio-gateway/Chart.yaml
+++ b/charts/kubezero-istio-gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-istio-gateway
 description: KubeZero Umbrella Chart for Istio gateways
 type: application
-version: 0.8.1
+version: 0.8.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml
index 51fe307..6f319a3 100644
--- a/charts/kubezero-istio/Chart.yaml
+++ b/charts/kubezero-istio/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-istio
 description: KubeZero Umbrella Chart for Istio
 type: application
-version: 0.8.1
+version: 0.8.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/docs/inf1-test.yaml b/docs/inf1-test.yaml
index 8f0a5a9..f125ced 100644
--- a/docs/inf1-test.yaml
+++ b/docs/inf1-test.yaml
@@ -11,7 +11,7 @@ spec:
     command:
     - "bash"
     - "-c"
-    - "/opt/aws/neuron/bin/neuron-ls && sleep 3600"
+    - "sleep 3600"
     imagePullPolicy: IfNotPresent
     name: neuron-top
     resources:
diff --git a/releases/v1.22/README.md b/releases/v1.22/README.md
index fbab88f..cdf134c 100644
--- a/releases/v1.22/README.md
+++ b/releases/v1.22/README.md
@@ -75,7 +75,7 @@ Workers automatically load the custom kernel module on these instance types and
   `cat <cluster/env/kubezero/application.yaml> | ./releases/v1.22/migrate_agro.py` and adjust if needed and replace the original. Do NOT commit yet !
 
 2. Upgrade `logging` and `metrics` module
-- `./bootstrap.sh crds logging <env>` CRDs for logging  
+- `kubectl get crd elasticsearches.elasticsearch.k8s.elastic.co && kubectl replace -f https://download.elastic.co/downloads/eck/2.1.0/crds.yaml` CRDs for logging  
 - `./bootstrap.sh apply logging <env>` logging module to support new OS coming with 1.22  
 - `./bootstrap.sh crds metrics <env>` CRDs for metrics
 - `./bootstrap.sh apply metrics <env>` to get new exporters in place to support 1.22