Merge pull request #201 from fidelity/Upgrade-helm-controller

Upgrade helm controller

Author: wangli1030

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -4,5 +4,4 @@
 
 <!--- Check all that apply -->
 
-- [ ] If any changes are made to the kraan-controller (\*.go, Dockerfile), bump VERSION file and `chart/Chart.yaml`'s `appVersion:`
-- [ ] If any changes are made to ./chart/templates, bump `chart/Chart.yaml`'s `version:`
+- [ ] If any changes are made, bump VERSION file `chart/Chart.yaml`'s `version:` and `chart/Chart.yaml`'s `appVersion:`, since chart version and appVersion are unified.

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/main.yaml

@@ -95,7 +95,7 @@ jobs:
           kubectl apply -f ./testdata/addons/addons.yaml
 
           echo "waiting 5m for test to pass..."
-          kubectl wait al --for=condition=Deployed --all --timeout=5m || (kubectl get po -A && false)
+          kubectl wait al --for=condition=Deployed --all --timeout=5m || (kubectl get po -A && kubectl describe al -A && false)
       - name: Orphan Integration Test
         run: |
           echo "setting up test..."
@@ -126,3 +126,18 @@ jobs:
           git config --global user.name "github-actions"
           git checkout go.mod go.sum
           make release
+  tag-repo:
+    needs: helm-publish
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: tag repository
+        if: github.event_name == 'push'
+        run: |
+          export VERSION=$(cat VERSION)
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions"
+          git tag -a $VERSION -m "tag version $VERSION"
+          git push origin --tags

Dockerfile

@@ -18,7 +18,7 @@ RUN go mod download
 RUN mkdir bin
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o bin/kraan-controller main/main.go
 RUN apt install -y curl
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.12/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.3/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.5/kustomize_v3.8.5_linux_amd64.tar.gz

Dockerfile-check

@@ -20,7 +20,7 @@ COPY bin/ bin/
 RUN apt install -y curl
 RUN bin/setup.sh
 # Temporary fix see https://github.com/fidelity/kraan/issues/114
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.12/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.3/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN cp bin/* /usr/local/bin

Dockerfile-dev

@@ -18,7 +18,7 @@ RUN go mod download
 RUN mkdir bin
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o bin/kraan-controller main/main.go
 RUN apt install -y curl
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.12/bin/linux/amd64/kubectl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.3/bin/linux/amd64/kubectl
 RUN chmod +x ./kubectl
 RUN mv kubectl bin
 RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.5/kustomize_v3.8.5_linux_amd64.tar.gz

VERSION

@@ -1 +1 @@
-v0.1.29
+v0.3.0

bin/setup.sh

@@ -5,7 +5,7 @@ kubebuilder_version=2.3.1
 mockgen_version=v1.4.4
 helm_version=v3.3.4
 kind_version=v0.9.0
-kubectl_version=v1.17.12
+kubectl_version=v1.19.3
 kustomize_version=v3.8.5
 
 function usage()
@@ -130,7 +130,7 @@ flux --version >/dev/null 2>&1
 ret_code="${?}"
 if [[ "${ret_code}" != "0" ]] ; then
     echo "Installing latest version of flux cli"
-    curl -s https://toolkit.fluxcd.io/install.sh | $sudo bash
+    curl -s https://fluxcd.io/install.sh | $sudo bash
     flux --version >/dev/null 2>&1 
     ret_code="${?}"
     if [ "${ret_code}" != "0" ] ; then

chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 description: A Helm chart for kraan controller
 name: kraan-controller
 type: application
-appVersion: v0.1.29
-version: v0.2.8
+appVersion: v0.3.0
+version: v0.3.0

chart/templates/gotk/helm-controller/crd.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   labels:
     app.kubernetes.io/instance: {{.Release.Namespace}}
@@ -190,7 +190,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   labels:
     app.kubernetes.io/instance: {{.Release.Namespace}}
@@ -203,6 +203,8 @@ spec:
     listKind: GitRepositoryList
     plural: gitrepositories
     singular: gitrepository
+    shortNames:
+    - gitrepo
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
@@ -247,6 +249,9 @@ spec:
               interval:
                 description: The interval at which to check for repository updates.
                 type: string
+              recurseSubmodules:
+                description: When enabled, after the clone is created, initializes all submodules within, using their default settings. This option is available only when using the 'go-git' GitImplementation.
+                type: boolean
               ref:
                 description: The Git reference to checkout and monitor for changes, defaults to master branch.
                 properties:
@@ -405,7 +410,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   labels:
     app.kubernetes.io/instance: {{.Release.Namespace}}
@@ -418,6 +423,8 @@ spec:
     listKind: HelmChartList
     plural: helmcharts
     singular: helmchart
+    shortNames:
+    - hc
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
@@ -488,8 +495,13 @@ spec:
                 description: This flag tells the controller to suspend the reconciliation of this source.
                 type: boolean
               valuesFile:
-                description: Alternative values file to use as the default chart values, expected to be a relative path in the SourceRef. Ignored when omitted.
+                description: Alternative values file to use as the default chart values, expected to be a relative path in the SourceRef. Deprecated in favor of ValuesFiles, for backwards compatibility the file defined here is merged before the ValuesFiles items. Ignored when omitted.
                 type: string
+              valuesFiles:
+                description: Alternative list of values files to use as the chart values (values.yaml is not included by default), expected to be a relative path in the SourceRef. Values files are merged in the order of this list with the last file overriding the first. Ignored when omitted.
+                items:
+                  type: string
+                type: array
               version:
                 default: '*'
                 description: The chart version semver expression, ignored for charts from GitRepository and Bucket sources. Defaults to latest when omitted.
@@ -596,7 +608,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   labels:
     app.kubernetes.io/instance: {{.Release.Namespace}}
@@ -608,6 +620,8 @@ spec:
     kind: HelmRepository
     listKind: HelmRepositoryList
     plural: helmrepositories
+    shortNames:
+    - helmrepo
     singular: helmrepository
   scope: Namespaced
   versions:

chart/templates/gotk/source-controller/crds.yaml

@@ -10,6 +10,8 @@ metadata:
   namespace: {{.Release.Namespace}}
 spec:
   replicas: 1
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       app: source-controller
@@ -37,6 +39,10 @@ spec:
 {{ toYaml .Values.global.prometheusAnnotations | indent 8 }}
         {{- end }}
     spec:
+      # Required for AWS IAM Role bindings
+      # https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts-technical-overview.html
+      securityContext:
+        fsGroup: 1337
       containers:
       - name: manager
         args:
@@ -62,13 +68,15 @@ spec:
         imagePullPolicy: {{ .Values.gotk.helmController.image.imagePullPolicy | default "IfNotPresent" }}
         livenessProbe:
           httpGet:
-            path: /
-            port: http
+            path: /healthz
+            port: healthz
         ports:
         - containerPort: 9090
           name: http
         - containerPort: 8080
           name: http-prom
+        - containerPort: 9440
+          name: healthz
         readinessProbe:
           httpGet:
             path: /

chart/templates/gotk/source-controller/deployment.yaml

@@ -91,7 +91,7 @@ gotk:
     image:
       repository: ghcr.io/fluxcd
       name: source-controller
-      tag: v0.7.1
+      tag: v0.12.2
       imagePullPolicy:
 
     imagePullSecrets:
@@ -143,7 +143,7 @@ gotk:
     image:
       repository: ghcr.io/fluxcd
       name: helm-controller
-      tag: v0.6.1
+      tag: v0.10.1
       imagePullPolicy:
 
     proxy: true

chart/values.yaml

@@ -99,23 +99,19 @@ func (r *AddonsLayerReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, opt
 	}
 	err = ctl.Watch(
 		&source.Kind{Type: &sourcev1.GitRepository{}},
-		&handler.EnqueueRequestsFromMapFunc{
-			ToRequests: handler.ToRequestsFunc(r.repoMapperFunc),
-		},
+		handler.EnqueueRequestsFromMapFunc(r.repoMapperFunc),
 		predicate.Funcs{
 			CreateFunc: func(e event.CreateEvent) bool {
 				r.Log.V(1).Info("create event for GitRepository", append(logging.GetFunctionAndSource(logging.MyCaller), logging.GetObjKindNamespaceName(e.Object)...)...)
 				return true
 			},
 			UpdateFunc: func(e event.UpdateEvent) bool {
 				r.Log.V(1).Info("update event", append(logging.GetFunctionAndSource(logging.MyCaller), logging.GetObjKindNamespaceName(e.ObjectNew)...)...)
-				if diff := cmp.Diff(e.MetaOld, e.MetaNew); len(diff) > 0 {
-					r.Log.V(1).Info("update event meta change", append(logging.GetFunctionAndSource(logging.MyCaller), append(logging.GetObjKindNamespaceName(e.ObjectNew), "diff", diff)...)...)
-				}
+
 				if diff := cmp.Diff(e.ObjectOld, e.ObjectNew); len(diff) > 0 {
 					r.Log.V(1).Info("update event object change", append(logging.GetFunctionAndSource(logging.MyCaller), append(logging.GetObjKindNamespaceName(e.ObjectNew), "diff", diff)...)...)
 				}
-				if e.MetaOld == nil || e.MetaNew == nil {
+				if e.ObjectOld == nil || e.ObjectNew == nil {
 					r.Log.Error(fmt.Errorf("nill object passed to watcher"), "skipping processing",
 						append(logging.GetFunctionAndSource(logging.MyCaller), "data", logging.LogJSON(e))...)
 					return false
@@ -181,9 +177,7 @@ func (r *AddonsLayerReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, opt
 	}
 	err = ctl.Watch(
 		&source.Kind{Type: &kraanv1alpha1.AddonsLayer{}},
-		&handler.EnqueueRequestsFromMapFunc{
-			ToRequests: handler.ToRequestsFunc(r.layerMapperFunc),
-		},
+		handler.EnqueueRequestsFromMapFunc(r.layerMapperFunc),
 		predicate.Funcs{
 			CreateFunc: func(e event.CreateEvent) bool {
 				r.Log.V(1).Info("create event for AddonsLayer, not processing will be processed by controller reconciler",
@@ -192,15 +186,11 @@ func (r *AddonsLayerReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, opt
 			},
 			UpdateFunc: func(e event.UpdateEvent) bool {
 				r.Log.V(1).Info("update event for AddonsLayer", append(logging.GetFunctionAndSource(logging.MyCaller), logging.GetObjKindNamespaceName(e.ObjectNew)...)...)
-				if diff := cmp.Diff(e.MetaOld, e.MetaNew); len(diff) > 0 {
-					r.Log.V(1).Info("update event meta change for AddonsLayer",
-						append(logging.GetFunctionAndSource(logging.MyCaller), append(logging.GetObjKindNamespaceName(e.ObjectNew), "diff", diff)...)...)
-				}
 				if diff := cmp.Diff(e.ObjectOld, e.ObjectNew); len(diff) > 0 {
 					r.Log.V(1).Info("update event object change for AddonsLayer",
 						append(logging.GetFunctionAndSource(logging.MyCaller), append(logging.GetObjKindNamespaceName(e.ObjectNew), "diff", diff)...)...)
 				}
-				if e.MetaOld == nil || e.MetaNew == nil {
+				if e.ObjectOld == nil || e.ObjectNew == nil {
 					r.Log.Error(fmt.Errorf("nill object passed to watcher for AddonsLayer"), "skipping processing",
 						append(logging.GetFunctionAndSource(logging.MyCaller), "data", logging.LogJSON(e))...)
 					return false
@@ -266,9 +256,6 @@ func predicates(logger logr.Logger) predicate.Funcs {
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			logger.V(1).Info("update event", append(logging.GetFunctionAndSource(logging.MyCaller),
 				append(logging.GetObjKindNamespaceName(e.ObjectNew), "layer", logging.GetLayer(e.ObjectNew))...)...)
-			if diff := cmp.Diff(e.MetaOld, e.MetaNew); len(diff) > 0 {
-				logger.V(1).Info("update event meta change", append(logging.GetFunctionAndSource(logging.MyCaller), append(logging.GetObjKindNamespaceName(e.ObjectNew), "diff", diff)...)...)
-			}
 			if diff := cmp.Diff(e.ObjectOld, e.ObjectNew); len(diff) > 0 {
 				logger.V(1).Info("update event object change", append(logging.GetFunctionAndSource(logging.MyCaller), append(logging.GetObjKindNamespaceName(e.ObjectNew), "diff", diff)...)...)
 			}
@@ -719,11 +706,10 @@ func (r *AddonsLayerReconciler) updateRequeue(l layers.Layer) (res ctrl.Result,
 // Reconcile process AddonsLayers custom resources.
 // +kubebuilder:rbac:groups=kraan.io,resources=addons,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=kraan.io,resources=addons/status,verbs=get;update;patch
-func (r *AddonsLayerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { // nolint:funlen,gocyclo,gocognit // ok
+func (r *AddonsLayerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { // nolint:funlen,gocyclo,gocognit // ok
 	logging.TraceCall(r.Log)
 	defer logging.TraceExit(r.Log)
 
-	ctx := r.Context
 	reconcileStart := time.Now()
 
 	var addonsLayer *kraanv1alpha1.AddonsLayer = &kraanv1alpha1.AddonsLayer{}
@@ -899,13 +885,13 @@ func (r *AddonsLayerReconciler) update(ctx context.Context, a *kraanv1alpha1.Add
 	return nil
 }
 
-func (r *AddonsLayerReconciler) repoMapperFunc(a handler.MapObject) []reconcile.Request { // nolint:gocyclo //ok
+func (r *AddonsLayerReconciler) repoMapperFunc(o client.Object) []reconcile.Request { // nolint:gocyclo //ok
 	logging.TraceCall(r.Log)
 	defer logging.TraceExit(r.Log)
 
-	srcRepo, ok := a.Object.(*sourcev1.GitRepository)
+	srcRepo, ok := o.(*sourcev1.GitRepository)
 	if !ok {
-		r.Log.Error(fmt.Errorf("unable to cast object to GitRepository"), "skipping processing", logging.GetObjKindNamespaceName(a.Object))
+		r.Log.Error(fmt.Errorf("unable to cast object to GitRepository"), "skipping processing", logging.GetObjKindNamespaceName(o))
 		return []reconcile.Request{}
 	}
 
@@ -950,13 +936,13 @@ func (r *AddonsLayerReconciler) repoMapperFunc(a handler.MapObject) []reconcile.
 	return addons
 }
 
-func (r *AddonsLayerReconciler) layerMapperFunc(a handler.MapObject) []reconcile.Request {
+func (r *AddonsLayerReconciler) layerMapperFunc(o client.Object) []reconcile.Request {
 	logging.TraceCall(r.Log)
 	defer logging.TraceExit(r.Log)
 
-	src, ok := a.Object.(*kraanv1alpha1.AddonsLayer)
+	src, ok := o.(*kraanv1alpha1.AddonsLayer)
 	if !ok {
-		r.Log.Error(fmt.Errorf("unable to cast object to AddonsLayer"), "skipping processing", logging.GetObjKindNamespaceName(a.Object))
+		r.Log.Error(fmt.Errorf("unable to cast object to AddonsLayer"), "skipping processing", logging.GetObjKindNamespaceName(o))
 		return []reconcile.Request{}
 	}
 
@@ -980,7 +966,7 @@ func (r *AddonsLayerReconciler) layerMapperFunc(a handler.MapObject) []reconcile
 	return addons
 }
 
-func (r *AddonsLayerReconciler) indexHelmReleaseByOwner(o runtime.Object) []string {
+func (r *AddonsLayerReconciler) indexHelmReleaseByOwner(o client.Object) []string {
 	logging.TraceCall(r.Log)
 	defer logging.TraceExit(r.Log)
 
@@ -1008,7 +994,7 @@ func (r *AddonsLayerReconciler) indexHelmReleaseByOwner(o runtime.Object) []stri
 	return []string{owner.Name}
 }
 
-func (r *AddonsLayerReconciler) indexHelmRepoByOwner(o runtime.Object) []string {
+func (r *AddonsLayerReconciler) indexHelmRepoByOwner(o client.Object) []string {
 	logging.TraceCall(r.Log)
 	defer logging.TraceExit(r.Log)