Helmv3 migration of the chart

charts/kubefed/.gitignore

@@ -0,0 +1 @@
+requirements.lock

charts/kubefed/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 description: KubeFed helm chart
 name: kubefed
-version: 0.0.2
+version: 0.0.3

charts/kubefed/README.md

@@ -25,38 +25,7 @@ group](https://groups.google.com/forum/#!forum/kubernetes-sig-multicluster).
 ## Prerequisites
 
 - Kubernetes 1.13+
-- Helm 2.10+
-
-## Configuring RBAC for Helm (Optional)
-
-If your Kubernetes cluster has RBAC enabled, it will be necessary to
-ensure that helm is deployed with a service account with the
-permissions necessary to deploy KubeFed:
-
-```bash
-$ cat << EOF | kubectl apply -f -
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tiller
-  namespace: kube-system
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: tiller
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-  - kind: ServiceAccount
-    name: tiller
-    namespace: kube-system
-EOF
-
-$ helm init --service-account tiller
-```
+- Helm 3.2+
 
 ## Installing the Chart
 
@@ -71,15 +40,26 @@ kubefed-charts   https://raw.githubusercontent.com/kubernetes-sigs/kubefed/maste
 
 With the repo added, available charts and versions can be viewed.
 ```bash
-$ helm search kubefed --devel
+$ helm search repo kubefed
 ```
 
 Install the chart and specify the version to install with the
 `--version` argument. Replace `<x.x.x>` with your desired version.
+If you don't want to install CRDs, add a `--skip-crds` at the end of the line:
+
 ```bash
-$ helm install kubefed-charts/kubefed --name kubefed --version=<x.x.x> --namespace kube-federation-system --devel
+$ helm --namespace kube-federation-system upgrade -i kubefed kubefed-charts/kubefed --version=<x.x.x> --create-namespace
+
+Release "kubefed" does not exist. Installing it now.
+NAME: kubefed
+LAST DEPLOYED: Wed Aug  5 16:03:46 2020
+NAMESPACE: kube-federation-system
+STATUS: deployed
+REVISION: 1
+TEST SUITE: None
 ```
 
+
 **NOTE:** For **namespace-scoped deployments** (configured with the `--set
 global.scope=Namespaced` option in the `helm install` command): if you created
 your namespace prior to installing the chart, make sure to **add a `name:
@@ -95,26 +75,16 @@ namespace with this label by default.
 
 ## Uninstalling the Chart
 
-Due to this helm [issue](https://github.com/helm/helm/issues/4440), the CRDs cannot be deleted
-when delete helm release, so before delete the helm release, we need first delete all
-of the CR and CRDs for KubeFed release.
-
 Delete all KubeFed `FederatedTypeConfig`:
 
 ```bash
 $ kubectl -n kube-federation-system delete FederatedTypeConfig --all
 ```
 
-Delete all KubeFed CRDs:
-
-```bash
-$ kubectl delete crd $(kubectl get crd | grep -E 'kubefed.io' | awk '{print $1}')
-```
-
 Then you can uninstall/delete the `kubefed` release:
 
 ```bash
-$ helm delete --purge kubefed
+$ helm --namespace kube-federation-system uninstall kubefed
 ```
 
 The command above removes all the Kubernetes components associated with the chart
@@ -159,3 +129,32 @@ provided while installing the chart. For example:
 ```bash
 $ helm install kubefed-charts/kubefed --name kubefed --namespace kube-federation-system --values values.yaml --devel
 ```
+
+## Migration from Helm v2 to v3
+
+Helm v3 has a built-in migration feature which can easy move your current Helm v2 installation to Helm v3.
+
+Download Helm v3 CLI from [Release Page](https://github.com/helm/helm/releases).
+
+Convert your kubefed installation to Helm v3:
+
+
+```bash
+$ helm 2to3 convert kubefed
+2020/08/06 18:50:57 Release "kubefed" will be converted from Helm v2 to Helm v3.
+2020/08/06 18:50:57 [Helm 3] Release "kubefed" will be created.
+2020/08/06 18:50:57 [Helm 3] ReleaseVersion "kubefed.v1" will be created.
+2020/08/06 18:50:58 [Helm 3] ReleaseVersion "kubefed.v1" created.
+2020/08/06 18:50:58 [Helm 3] Release "kubefed" created.
+2020/08/06 18:50:58 Release "kubefed" was converted successfully from Helm v2 to Helm v3.
+2020/08/06 18:50:58 Note: The v2 release information still remains and should be removed to avoid conflicts with the migrated v3 release.
+2020/08/06 18:50:58 v2 release information should only be removed using `helm 2to3` cleanup and when all releases have been migrated over.
+```
+
+Check your successful migration:
+
+```bash
+$ helm -n kube-federation-system list
+NAME    NAMESPACE               REVISION        UPDATED                                 STATUS          CHART           APP VERSION
+kubefed kube-federation-system  1               2020-08-06 16:49:41.593438079 +0000 UTC deployed        kubefed-0.3.1
+```

charts/kubefed/charts/controllermanager/Chart.yaml

@@ -1,5 +1,5 @@
-apiVersion: v1
-appVersion: "0.0.2"
+apiVersion: v2
+appVersion: "0.0.3"
 description: A Helm chart for KubeFed Controller Manager
 name: controllermanager
-version: 0.0.2
+version: 0.0.3

charts/kubefed/charts/controllermanager/templates/crds.yaml → charts/kubefed/charts/controllermanager/crds/crds.yaml

@@ -1,12 +1,7 @@
-{{ if (or (or (not .Values.global.scope) (eq .Values.global.scope "Cluster")) (not (.Capabilities.APIVersions.Has "core.kubefed.io/v1beta1"))) }}
----
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: clusterpropagatedversions.core.kubefed.io
 spec:
@@ -89,8 +84,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: federatedservicestatuses.core.kubefed.io
 spec:
@@ -174,8 +167,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: federatedtypeconfigs.core.kubefed.io
 spec:
@@ -350,8 +341,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: kubefedclusters.core.kubefed.io
 spec:
@@ -492,8 +481,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: kubefedconfigs.core.kubefed.io
 spec:
@@ -625,8 +612,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: propagatedversions.core.kubefed.io
 spec:
@@ -709,8 +694,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: dnsendpoints.multiclusterdns.kubefed.io
 spec:
@@ -799,8 +782,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: domains.multiclusterdns.kubefed.io
 spec:
@@ -854,8 +835,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: ingressdnsrecords.multiclusterdns.kubefed.io
 spec:
@@ -953,8 +932,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: servicednsrecords.multiclusterdns.kubefed.io
 spec:
@@ -1090,8 +1067,6 @@ status:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   creationTimestamp: null
   name: replicaschedulingpreferences.scheduling.kubefed.io
 spec:
@@ -1195,4 +1170,3 @@ status:
   conditions: []
   storedVersions: []
 ---
-{{ end }}

charts/kubefed/templates/crds.yaml → charts/kubefed/crds/crds.yaml

@@ -1,10 +1,7 @@
-{{ if (or (or (not .Values.global.scope) (eq .Values.global.scope "Cluster")) (not (.Capabilities.APIVersions.Has "types.kubefed.io/v1beta1"))) }}
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedclusterroles.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -133,8 +130,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedconfigmaps.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -265,8 +260,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federateddeployments.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -399,8 +392,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedingresses.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -531,8 +522,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedjobs.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -661,8 +650,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatednamespaces.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -793,8 +780,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedreplicasets.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -927,8 +912,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedsecrets.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -1057,8 +1040,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedserviceaccounts.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -1189,8 +1170,6 @@ spec:
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    "helm.sh/hook": crd-install
   name: federatedservices.types.kubefed.io
 spec:
   group: types.kubefed.io
@@ -1317,4 +1296,3 @@ spec:
       required:
       - spec
   version: v1beta1
-{{ end }}

scripts/delete-kubefed.sh

@@ -25,15 +25,13 @@ source "$(dirname "${BASH_SOURCE}")/util.sh"
 
 function delete-helm-deployment() {
   # Clean kubefed resources
+  echo "Delete FederatedTypeConfigs"
   ${KCD} -n "${NS}" FederatedTypeConfig --all
-  if [[ ! "${NAMESPACED}" || "${DELETE_CLUSTER_RESOURCE}" ]]; then
-    ${KCD} crd $(kubectl get crd | grep -E 'kubefed.io' | awk '{print $1}')
-  fi
 
   if [[ "${NAMESPACED}" ]]; then
-    helm delete --purge kubefed-${NS}
+    helm -n ${NS} uninstall kubefed-${NS}
   else
-    helm delete --purge kubefed
+    helm -n ${NS} uninstall kubefed
   fi
 }
 
@@ -64,6 +62,9 @@ delete-helm-deployment
 
 ${KCD} ns "${NS}"
 
+echo "Helm uninstall finished"
+exit 0
+
 # Wait for the namespaces to be removed
 function ns-deleted() {
   kubectl get ns "${1}" &> /dev/null