Merge pull request #216 from flux-framework/fix-controller-gen

update controller gen
flux-framework · Feb 22, 2024 · 97b1244 · 97b1244
2 parents a684fd3 + c9b690d
commit 97b1244
Show file tree

Hide file tree

Showing 11 changed files with 721 additions and 530 deletions.
diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml
@@ -18,7 +18,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.18.1
+        go-version: ^1.20
     - name: GHCR Login
       if: (github.event_name != 'pull_request')
       uses: docker/login-action@v2
@@ -48,7 +48,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.18.1
+        go-version: ^1.20
     - name: GHCR Login
       if: (github.event_name != 'pull_request')
       uses: docker/login-action@v2

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -16,7 +16,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.18.1
+        go-version: ^1.20
     - name: GHCR Login
       if: (github.event_name != 'pull_request')
       uses: docker/login-action@v2
@@ -44,4 +44,4 @@ jobs:
         PKG_RESPONSE=$(helm package ./chart)
         echo "$PKG_RESPONSE"
         CHART_TAR_GZ=$(basename "$PKG_RESPONSE") 
-        helm push "$CHART_TAR_GZ" oci://ghcr.io/flux-framework/flux-operator-helm
+        helm push "$CHART_TAR_GZ" oci://ghcr.io/flux-framework/flux-operator-helm
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,7 +21,7 @@ jobs:
         echo "tag=${{ inputs.release_tag }}" >> ${GITHUB_ENV}
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.18.1
+        go-version: ^1.20
     - name: GHCR Login
       uses: docker/login-action@v2
       with:
@@ -51,7 +51,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.18.1
+        go-version: ^1.20
     - name: Set tag
       run: |
         echo "Tag for release is ${{ inputs.release_tag }}"
@@ -86,7 +86,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.18.1
+        go-version: ^1.20
     - name: Set tag
       run: |
         echo "Tag for release is ${{ inputs.release_tag }}"

diff --git a/Makefile b/Makefile
@@ -330,7 +330,7 @@ SWAGGER_API_JSON ?= ./api/${API_VERSION}/swagger.json
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.0
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
diff --git a/chart/templates/minicluster-crd.yaml b/chart/templates/minicluster-crd.yaml
diff --git a/config/crd/bases/flux-framework.org_miniclusters.yaml b/config/crd/bases/flux-framework.org_miniclusters.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

diff --git a/examples/dist/flux-operator-arm.yaml b/examples/dist/flux-operator-arm.yaml
diff --git a/examples/dist/flux-operator.yaml b/examples/dist/flux-operator.yaml
diff --git a/pkg/flux/config.go b/pkg/flux/config.go
@@ -93,7 +93,7 @@ func getRequiredRanks(cluster *api.MiniCluster) string {
 	if cluster.Spec.MaxSize == cluster.Spec.Size {
 		return requiredRanks
 	}
-	
+
 	// This is the quorum - the nodes required to be online - so we can start
 	// This can be less than the MaxSize
 	return fmt.Sprintf("%d", cluster.Spec.Size)