move to operator sdk v4 + refacto + add unitest

Author: Donatien26

Dockerfile

@@ -12,9 +12,8 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY cmd/main.go main.go
+COPY cmd/main.go cmd/main.go
 COPY api/ api/
-COPY controllers/ controllers/
 COPY internal/ internal/
 
 
@@ -23,7 +22,7 @@ COPY internal/ internal/
 # was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
 # the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
 # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

Makefile

@@ -48,12 +48,12 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.32.0
+OPERATOR_SDK_VERSION ?= v1.39.1
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.26.0
+ENVTEST_K8S_VERSION = 1.32.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -113,11 +113,11 @@ test: manifests generate fmt vet envtest ## Run tests.
 
 .PHONY: build
 build: manifests generate fmt vet ## Build manager binary.
-	go build -o bin/manager main.go
+	go build -o bin/manager cmd/main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./main.go
+	go run ./cmd/main.go
 
 # If you wish built the manager image targeting other platforms you can use the --platform flag.
 # (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
@@ -184,7 +184,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.11.1
+CONTROLLER_TOOLS_VERSION ?= v0.17.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

PROJECT

@@ -1,41 +1,59 @@
-# Code generated by tool. DO NOT EDIT.
-# This file is used to track the info used to scaffold your project
-# and allow the plugins properly work.
-# More info: https://book.kubebuilder.io/reference/project-config.html
-domain: onyxia.sh
-layout:
-- go.kubebuilder.io/v3
-plugins:
-  manifests.sdk.operatorframework.io/v2: {}
-  scorecard.sdk.operatorframework.io/v2: {}
-projectName: s3-operator
-repo: github.com/InseeFrLab/s3-operator
-resources:
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: onyxia.sh
-  group: s3.onyxia.sh
-  kind: Bucket
-  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
-  version: v1alpha1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: onyxia.sh
-  group: s3.onyxia.sh
-  kind: Policy
-  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
-  version: v1alpha1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: onyxia.sh
-  group: s3.onyxia.sh
-  kind: Path
-  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
-  version: v1alpha1
-version: "3"
+# Code generated by tool. DO NOT EDIT.
+# This file is used to track the info used to scaffold your project
+# and allow the plugins properly work.
+# More info: https://book.kubebuilder.io/reference/project-config.html
+domain: onyxia.sh
+layout:
+- go.kubebuilder.io/v4
+plugins:
+  manifests.sdk.operatorframework.io/v2: {}
+  scorecard.sdk.operatorframework.io/v2: {}
+projectName: s3-operator
+repo: github.com/InseeFrLab/s3-operator
+resources:
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: onyxia.sh
+  group: s3.onyxia.sh
+  kind: Bucket
+  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: onyxia.sh
+  group: s3.onyxia.sh
+  kind: Policy
+  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: onyxia.sh
+  group: s3.onyxia.sh
+  kind: Path
+  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: onyxia.sh
+  group: s3.onyxia.sh
+  kind: S3instance
+  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: onyxia.sh
+  group: s3.onyxia.sh
+  kind: S3User
+  path: github.com/InseeFrLab/s3-operator/api/v1alpha1
+  version: v1alpha1
+version: "3"

api/v1alpha1/bucket_types.go

@@ -77,16 +77,17 @@ type BucketList struct {
 	Items           []Bucket `json:"items"`
 }
 
-func init() {
-	SchemeBuilder.Register(&Bucket{}, &BucketList{})
-}
 
 type Quota struct {
 	// Default quota to apply, mandatory
 	// +kubebuilder:validation:Required
 	Default int64 `json:"default"`
-
+	
 	// Optional override quota, to be used by cluster admin.
 	// +kubebuilder:validation:Optional
 	Override int64 `json:"override,omitempty"`
 }
+
+func init() {
+	SchemeBuilder.Register(&Bucket{}, &BucketList{})
+}

api/v1alpha1/zz_generated.deepcopy.go

@@ -27,11 +27,11 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	s3v1alpha1 "github.com/InseeFrLab/s3-operator/api/v1alpha1"
-	bucketControllers "github.com/InseeFrLab/s3-operator/controllers/bucket"
-	pathControllers "github.com/InseeFrLab/s3-operator/controllers/path"
-	policyControllers "github.com/InseeFrLab/s3-operator/controllers/policy"
-	s3InstanceControllers "github.com/InseeFrLab/s3-operator/controllers/s3instance"
-	userControllers "github.com/InseeFrLab/s3-operator/controllers/user"
+	bucketControllers "github.com/InseeFrLab/s3-operator/internal/controller/bucket"
+	pathControllers "github.com/InseeFrLab/s3-operator/internal/controller/path"
+	policyControllers "github.com/InseeFrLab/s3-operator/internal/controller/policy"
+	s3InstanceControllers "github.com/InseeFrLab/s3-operator/internal/controller/s3instance"
+	userControllers "github.com/InseeFrLab/s3-operator/internal/controller/user"
 
 	"go.uber.org/zap/zapcore"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -64,7 +64,6 @@ func (flags *ArrayFlags) Set(value string) error {
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-
 	utilruntime.Must(s3v1alpha1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }