Skip to content

Commit

Permalink
Develop (#1199)
Browse files Browse the repository at this point in the history
* Null check on crd object list in mutating webhook delete

Fixes: #1196

* Removing previous chart if one exists (helmer and kubeconfiggenerator)

Fixes: #1197

* README and examples updates to use KubePlus 3.0.31
  • Loading branch information
devdattakulkarni authored Dec 18, 2023
1 parent df953f4 commit 8969d57
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
4 changes: 2 additions & 2 deletions deploy/kubeplus-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

6 changes: 3 additions & 3 deletions deploy/kubeplus-chart/templates/kubeplus-components-6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/multitenancy/hello-world/steps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/multitenancy/odoo/steps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/multitenancy/wordpress/steps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8969d57

Please sign in to comment.