Rename webhooks

Fix #86
cybozu-go · Sep 28, 2023 · ea3bbc1 · ea3bbc1
1 parent 7573c38
commit ea3bbc1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/charts/accurate/templates/generated/generated.yaml b/charts/accurate/templates/generated/generated.yaml
@@ -233,7 +233,7 @@ webhooks:
         namespace: '{{ .Release.Namespace }}'
         path: /mutate-accurate-cybozu-com-v1-subnamespace
     failurePolicy: Fail
-    name: msubnamespace.kb.io
+    name: subnamespace.accurate.cybozu.io
     rules:
       - apiGroups:
           - accurate.cybozu.com
@@ -266,7 +266,7 @@ webhooks:
         namespace: '{{ .Release.Namespace }}'
         path: /validate-v1-namespace
     failurePolicy: Fail
-    name: vnamespace.kb.io
+    name: namespace.accurate.cybozu.io
     rules:
       - apiGroups:
           - ""

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -12,7 +12,7 @@ webhooks:
       namespace: system
       path: /mutate-accurate-cybozu-com-v1-subnamespace
   failurePolicy: Fail
-  name: msubnamespace.kb.io
+  name: subnamespace.accurate.cybozu.io
   rules:
   - apiGroups:
     - accurate.cybozu.com
@@ -38,7 +38,7 @@ webhooks:
       namespace: system
       path: /validate-v1-namespace
   failurePolicy: Fail
-  name: vnamespace.kb.io
+  name: namespace.accurate.cybozu.io
   rules:
   - apiGroups:
     - ""

diff --git a/e2e/Makefile b/e2e/Makefile
@@ -5,6 +5,8 @@ KUBECONFIG := $(shell pwd)/.kubeconfig
 KIND_CONFIG = kind-config.yaml
 export KUBECTL KUBECONFIG
 
+PATH := $(shell aqua root-dir)/bin:$(PATH)"
+export PATH
 
 .PHONY: help
 help:

diff --git a/hooks/namespace.go b/hooks/namespace.go
@@ -15,7 +15,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-//+kubebuilder:webhook:path=/validate-v1-namespace,mutating=false,failurePolicy=fail,sideEffects=None,groups="",resources=namespaces,verbs=create;update;delete,versions=v1,name=vnamespace.kb.io,admissionReviewVersions={v1}
+//+kubebuilder:webhook:path=/validate-v1-namespace,mutating=false,failurePolicy=fail,sideEffects=None,groups="",resources=namespaces,verbs=create;update;delete,versions=v1,name=namespace.accurate.cybozu.io,admissionReviewVersions={v1}
 
 type namespaceValidator struct {
 	client.Client

diff --git a/hooks/subnamespace.go b/hooks/subnamespace.go
@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-//+kubebuilder:webhook:path=/mutate-accurate-cybozu-com-v1-subnamespace,mutating=true,failurePolicy=fail,sideEffects=None,groups=accurate.cybozu.com,resources=subnamespaces,verbs=create;update,versions=v1,name=msubnamespace.kb.io,admissionReviewVersions={v1}
+//+kubebuilder:webhook:path=/mutate-accurate-cybozu-com-v1-subnamespace,mutating=true,failurePolicy=fail,sideEffects=None,groups=accurate.cybozu.com,resources=subnamespaces,verbs=create;update,versions=v1,name=subnamespace.accurate.cybozu.io,admissionReviewVersions={v1}
 
 type subNamespaceMutator struct {
 	dec *admission.Decoder