KubePlus chart - 4.0.0 (#1345)

README.md

@@ -86,7 +86,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.47.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json -n $KUBEPLUS_NS
+   helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.0.0.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
    ```
 
@@ -218,6 +218,22 @@ Make sure you have installed latest version of kubectl and you have created a mi
 KubePlus architecture details are available [here](https://cloud-ark.github.io/kubeplus/docs/html/html/index.html).
 KubePlus is a referenced solution for [multi-customer tenancy in Kubernetes](https://kubernetes.io/docs/concepts/security/multi-tenancy/#multi-customer-tenancy).
 
+### Migrate to version 4.0.0+
+
+If you are using KubePlus chart version < 4.0.0, follow these steps to migrate to 4.0.0+ versions.
+In versions < 4.0.0, the KubePlus's built-in CRDs like `ResourceComposition` were included in the chart's
+`templates` folder. This led to them getting deleted on KubePlus's upgrade. In 4.0.0+ version, the CRDs
+have been moved to the `crds` folder, which avoids this issue.
+
+```
+kubectl annotate customresourcedefinition resourcepolicies.workflows.kubeplus helm.sh/resource-policy=keep
+kubectl annotate customresourcedefinition resourceevents.workflows.kubeplus helm.sh/resource-policy=keep
+kubectl annotate customresourcedefinition resourcemonitors.workflows.kubeplus helm.sh/resource-policy=keep
+kubectl annotate customresourcedefinition resourcecompositions.workflows.kubeplus helm.sh/resource-policy=keep
+
+helm upgrade kubeplus <4.0.0+ version> -n $KUBEPLUS_NS --kubeconfig=kubeplus-saas-provider.json
+```
+
 ## Contributing
 
 Check the [contributing guidelines](./Contributing.md).

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.47
+version: 4.0.0
 
 # 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: 9d6c5f68da5169fd5bc78e82c822b81e9a0659bf
+appVersion: ac156e624c1b15df767ed47d45f8936aae663cc2
 

deploy/kubeplus-chart/templates/kubeplus-non-pod-resources.yaml → deploy/kubeplus-chart/crds/kubeplus-crds.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: resourceevents.workflows.kubeplus
+  annotations:
+    "helm.sh/resource-policy": "keep"
 spec:
   group: workflows.kubeplus
   versions:
@@ -26,6 +28,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: resourcemonitors.workflows.kubeplus
+  annotations:
+    "helm.sh/resource-policy": "keep"
 spec:
   group: workflows.kubeplus
   versions:
@@ -59,6 +63,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: resourcecompositions.workflows.kubeplus
+  annotations:
+    "helm.sh/resource-policy": "keep"
 spec:
   group: workflows.kubeplus
   versions:
@@ -187,6 +193,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: resourcepolicies.workflows.kubeplus
+  annotations:
+    "helm.sh/resource-policy": "keep"
 spec:
   group: workflows.kubeplus
   versions: 

examples/multitenancy/application-hosting/odoo/steps.txt

@@ -20,7 +20,7 @@ This example shows delivering Bitnami Odoo Helm chart as-a-service using KubePlu
        $ 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.47.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json 
+     $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.0.0.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json 
    - Wait till KubePlus Pod is Running
      $ kubectl get pods -A
 

examples/multitenancy/application-hosting/wordpress/steps.txt

@@ -29,7 +29,7 @@ $ kubectl kubeplus commands
      $ cd examples/multitenancy/wordpress/
 
 4. Install KubePlus Operator:
-   $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.47.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=kubeplus-saas-provider.json
+   $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.0.0.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=kubeplus-saas-provider.json
 
 5. Extract consumer kubeconfig:
    $ kubectl retrieve kubeconfig consumer $KUBEPLUS_NS -s $apiserver > consumer.conf

examples/multitenancy/hello-world/steps.txt

@@ -31,7 +31,7 @@ $ apiserver=`kubectl config view --minify -o jsonpath='{.clusters[0].cluster.ser
 $ python3 provider-kubeconfig.py -s $apiserver create $KUBEPLUS_NS
 $ cp kubeplus-saas-provider.json examples/multitenancy/hello-world/provider.conf
 $ cd examples/multitenancy/hello-world/
-$ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-3.0.47.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=provider.conf
+$ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.0.0.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=provider.conf
 $ kubectl get pods (wait till kubeplus pod is Running)
 
 

examples/multitenancy/managed-service/appday2ops/steps.txt

@@ -13,7 +13,7 @@ Install KubePlus:
 $ 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.47.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=provider.conf
+$ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.0.0.tgz?raw=true" -n $KUBEPLUS_NS --kubeconfig=provider.conf
 $ until kubectl get pods -A | grep kubeplus | grep Running; do echo "Waiting for KubePlus to start.."; sleep 1; done
 
 

examples/multitenancy/platform-engineering/steps.txt

@@ -29,7 +29,7 @@ Platform Engineering team
        $ 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.47.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json 
+     $ helm install kubeplus "https://github.com/cloud-ark/operatorcharts/blob/master/kubeplus-chart-4.0.0.tgz?raw=true" --kubeconfig=kubeplus-saas-provider.json 
    - Wait till KubePlus Pod is Running
      $ kubectl get pods -A