Merge pull request #107 from hiddenmarten/master

[81] Manifests rendering fix
seaweedfs · Jun 15, 2024 · 528c848 · 528c848
2 parents 8211c1f + 8f3c58e
commit 528c848
Show file tree

Hide file tree

Showing 7 changed files with 1,639 additions and 1,932 deletions.
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ delete: manifests kustomize
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 # Run go fmt against code
 fmt:
@@ -95,7 +95,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

diff --git a/api/v1/seaweed_webhook.go b/api/v1/seaweed_webhook.go
@@ -39,7 +39,7 @@ func (r *Seaweed) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 
-// +kubebuilder:webhook:path=/mutate-seaweed-seaweedfs-com-v1-seaweed,mutating=true,failurePolicy=fail,groups=seaweed.seaweedfs.com,resources=seaweeds,verbs=create;update,versions=v1,name=mseaweed.kb.io
+// +kubebuilder:webhook:path=/mutate-seaweed-seaweedfs-com-v1-seaweed,mutating=true,failurePolicy=fail,sideEffects=None,groups=seaweed.seaweedfs.com,resources=seaweeds,verbs=create;update,versions=v1,name=mseaweed.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Defaulter = &Seaweed{}
 
@@ -51,7 +51,7 @@ func (r *Seaweed) Default() {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-// +kubebuilder:webhook:verbs=create;update,path=/validate-seaweed-seaweedfs-com-v1-seaweed,mutating=false,failurePolicy=fail,groups=seaweed.seaweedfs.com,resources=seaweeds,versions=v1,name=vseaweed.kb.io
+// +kubebuilder:webhook:verbs=create;update,path=/validate-seaweed-seaweedfs-com-v1-seaweed,mutating=false,failurePolicy=fail,sideEffects=None,groups=seaweed.seaweedfs.com,resources=seaweeds,versions=v1,name=vseaweed.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Seaweed{}
 

diff --git a/config/crd/bases/seaweed.seaweedfs.com_seaweeds.yaml b/config/crd/bases/seaweed.seaweedfs.com_seaweeds.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ghcr.io/seaweedfs/seaweedfs-operator
-  newTag: latest
+  newName: chrislusf/seaweedfs-operator
+  newTag: v0.0.1
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,9 +1,7 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -1,23 +1,18 @@
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
-- clientConfig:
-    caBundle: Cg==
+- admissionReviewVersions:
+  - v1
+  clientConfig:
     service:
       name: webhook-service
       namespace: system
       path: /mutate-seaweed-seaweedfs-com-v1-seaweed
   failurePolicy: Fail
   name: mseaweed.kb.io
-  sideEffects: None
-  admissionReviewVersions:
-  - v1
-  - v1beta1
   rules:
   - apiGroups:
     - seaweed.seaweedfs.com
@@ -28,26 +23,22 @@ webhooks:
     - UPDATE
     resources:
     - seaweeds
-
+  sideEffects: None
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
-- clientConfig:
-    caBundle: Cg==
+- admissionReviewVersions:
+  - v1
+  clientConfig:
     service:
       name: webhook-service
       namespace: system
       path: /validate-seaweed-seaweedfs-com-v1-seaweed
   failurePolicy: Fail
   name: vseaweed.kb.io
-  sideEffects: None
-  admissionReviewVersions:
-  - v1
-  - v1beta1
   rules:
   - apiGroups:
     - seaweed.seaweedfs.com
@@ -58,3 +49,4 @@ webhooks:
     - UPDATE
     resources:
     - seaweeds
+  sideEffects: None
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/seaweedfs/seaweedfs-operator
 
-go 1.17
+go 1.22.4
 
 require (
 	github.com/go-logr/logr v1.2.3