From 8969d570119702703e6d28a37bec9ca1179c6e06 Mon Sep 17 00:00:00 2001 From: Dev <732525+devdattakulkarni@users.noreply.github.com> Date: Mon, 18 Dec 2023 05:52:17 -0600 Subject: [PATCH] Develop (#1199) * Null check on crd object list in mutating webhook delete Fixes: https://github.com/cloud-ark/kubeplus/issues/1196 * Removing previous chart if one exists (helmer and kubeconfiggenerator) Fixes: https://github.com/cloud-ark/kubeplus/issues/1197 * README and examples updates to use KubePlus 3.0.31 --- README.md | 2 +- deploy/kubeplus-chart/Chart.yaml | 4 ++-- deploy/kubeplus-chart/templates/kubeplus-components-6.yaml | 6 +++--- examples/multitenancy/hello-world/steps.txt | 2 +- examples/multitenancy/odoo/steps.txt | 2 +- examples/multitenancy/wordpress/steps.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7a9d1681..e3232b39 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Let’s look at an example of creating a multi-instance WordPress Service using 5) Install KubePlus Operator using the generated provider kubeconfig ``` - helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.30.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json -n $KUBEPLUS_NS + helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.31.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json -n $KUBEPLUS_NS until kubectl get pods -A | grep kubeplus | grep Running; do echo "Waiting for KubePlus to start.."; sleep 1; done ``` diff --git a/deploy/kubeplus-chart/Chart.yaml b/deploy/kubeplus-chart/Chart.yaml index a8e1e871..9e65756b 100644 --- a/deploy/kubeplus-chart/Chart.yaml +++ b/deploy/kubeplus-chart/Chart.yaml @@ -7,10 +7,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.0.30 +version: 3.0.31 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: b3a22706c30a6f4a81901150197feeed69bb665d +appVersion: df953f49a42eaa14632c0f90202eb77de45f07f1 diff --git a/deploy/kubeplus-chart/templates/kubeplus-components-6.yaml b/deploy/kubeplus-chart/templates/kubeplus-components-6.yaml index 0479bb5d..e0d6ab1e 100644 --- a/deploy/kubeplus-chart/templates/kubeplus-components-6.yaml +++ b/deploy/kubeplus-chart/templates/kubeplus-components-6.yaml @@ -317,7 +317,7 @@ spec: - "webhook-tls-certificates" containers: - name: kubeconfiggenerator - image: gcr.io/cloudark-kubeplus/kubeconfiggenerator:3.0.23 + image: gcr.io/cloudark-kubeplus/kubeconfiggenerator:3.0.24 imagePullPolicy: IfNotPresent env: - name: KUBEPLUS_NAMESPACE @@ -332,7 +332,7 @@ spec: - name: shared-data mountPath: /crdinstances - name: crd-hook - image: gcr.io/cloudark-kubeplus/pac-mutating-admission-webhook:3.0.11 + image: gcr.io/cloudark-kubeplus/pac-mutating-admission-webhook:3.0.12 imagePullPolicy: IfNotPresent env: - name: CHECK_KYVERNO_POLICIES @@ -358,7 +358,7 @@ spec: imagePullPolicy: IfNotPresent command: [ "python3", "/root/consumerui.py"] - name: helmer - image: gcr.io/cloudark-kubeplus/helm-pod:3.0.15 + image: gcr.io/cloudark-kubeplus/helm-pod:3.0.16 imagePullPolicy: IfNotPresent command: ["/root/helm-pod"] volumeMounts: diff --git a/examples/multitenancy/hello-world/steps.txt b/examples/multitenancy/hello-world/steps.txt index 851cd78d..2fba2fea 100644 --- a/examples/multitenancy/hello-world/steps.txt +++ b/examples/multitenancy/hello-world/steps.txt @@ -18,7 +18,7 @@ Install KubePlus Operator $ KUBEPLUS_NS=default $ python ../../../provider-kubeconfig.py create $KUBEPLUS_NS $ cp kubeplus-saas-provider.json provider.conf -$ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.30.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=provider.conf +$ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.31.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=provider.conf $ kubectl get pods (wait till kubeplus pod is Running) Install KubePlus kubectl plugins diff --git a/examples/multitenancy/odoo/steps.txt b/examples/multitenancy/odoo/steps.txt index 3ffc9a11..127b7664 100644 --- a/examples/multitenancy/odoo/steps.txt +++ b/examples/multitenancy/odoo/steps.txt @@ -19,7 +19,7 @@ This example shows delivering Bitnami Odoo Helm chart as-a-service using KubePlu $ server=`more $KUBECONFIG | grep server | cut -d '/' -f 3` $ python ../../../provider-kubeconfig.py create default -s $server - Install KubePlus - $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.30.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json + $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.31.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json - Wait till KubePlus Pod is Running $ kubectl get pods -A diff --git a/examples/multitenancy/wordpress/steps.txt b/examples/multitenancy/wordpress/steps.txt index 39612601..2f0ea0ae 100644 --- a/examples/multitenancy/wordpress/steps.txt +++ b/examples/multitenancy/wordpress/steps.txt @@ -23,7 +23,7 @@ This example shows delivering Wordpress Helm chart as-a-service using KubePlus. $ python ../../../provider-kubeconfig.py create $KUBEPLUS_NS 4. Install KubePlus Operator: - $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.30.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=kubeplus-saas-provider.json + $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.31.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=kubeplus-saas-provider.json 5. Extract consumer kubeconfig: $ kubectl get configmaps kubeplus-saas-consumer-kubeconfig -n $KUBEPLUS_NS -o jsonpath="{.data.kubeplus-saas-consumer\.json}" > consumer.conf