chore: mv admission webhook to webhook dir. (#4885)

* chore: mv admission webhook to webhook dir. Signed-off-by: yy <[email protected]> Signed-off-by: yy <[email protected]> * chore: fix controllers go work. Signed-off-by: yy <[email protected]> Signed-off-by: yy <[email protected]> * chore: fix controllers go work. Signed-off-by: yy <[email protected]> Signed-off-by: yy <[email protected]> * chore: fix webhook go work. Signed-off-by: yy <[email protected]> Signed-off-by: yy <[email protected]> * chore: fix webhook build. Signed-off-by: yy <[email protected]> Signed-off-by: yy <[email protected]> --------- Signed-off-by: yy <[email protected]>
labring · Jul 11, 2024 · 7e9a193 · 7e9a193
1 parent 39a8065
commit 7e9a193
Show file tree

Hide file tree

Showing 108 changed files with 557 additions and 3,578 deletions.
diff --git a/.github/workflows/controllers.yml b/.github/workflows/controllers.yml
@@ -99,7 +99,6 @@ jobs:
           - { name: job-heartbeat, path: job/heartbeat }
           - { name: resources, path: resources }
           - { name: node, path: node }
-          - { name: admission, path: admission }
           - { name: objectstorage, path: objectstorage }
     steps:
       - name: Checkout
@@ -202,7 +201,6 @@ jobs:
           - { name: job-heartbeat, path: job/heartbeat }
           - { name: resources, path: resources }
           - { name: node, path: node }
-          - { name: admission, path: admission }
           - { name: objectstorage, path: objectstorage }
     steps:
       - name: Checkout

diff --git a/.github/workflows/webhooks.yml b/.github/workflows/webhooks.yml
@@ -23,7 +23,7 @@ on:
       - "!**/*.yaml"
 env:
   # Common versions
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.22"
   DEFAULT_OWNER: "labring"
 
 jobs:
@@ -67,7 +67,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        module: [ whitelist ]
+        module: [ admission ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/controllers/admission/api/v1/webhook_suite_test.go b/controllers/admission/api/v1/webhook_suite_test.go
diff --git a/controllers/admission/go.mod b/controllers/admission/go.mod
diff --git a/controllers/go.work b/controllers/go.work
@@ -4,7 +4,6 @@ toolchain go1.22.3
 
 use (
 	./account
-	./admission
 	./app
 	./db/adminer
 	./job/heartbeat

diff --git a/controllers/go.work.sum b/controllers/go.work.sum
@@ -113,6 +113,7 @@ cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOV
 cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=
 cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
 cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 cloud.google.com/go/contactcenterinsights v1.6.0 h1:jXIpfcH/VYSE1SYcPzO0n1VVb+sAamiLOgCw45JbOQk=
 cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
 cloud.google.com/go/contactcenterinsights v1.10.0 h1:YR2aPedGVQPpFBZXJnPkqRj8M//8veIZZH5ZvICoXnI=
@@ -705,6 +706,7 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
 github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
 github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1138,6 +1140,7 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=

diff --git a/go.work b/go.work
@@ -4,6 +4,5 @@ use (
 	.
 	./staging/src/github.com/labring/image-cri-shim
 	./staging/src/github.com/labring/lvscare
-	./webhooks/whitelist
 	./test/e2e
 )