fix: bug in kube client apply for mutating manifest when webhook is o…

…utside cluster. (#16) * bug: fix kube client apply for mutating manifest. * chore: Fix CI lint --------- Co-authored-by: David MICHENEAU <david.micheneau@orange.com>
orange-cloudavenue · Sep 27, 2024 · 1605b47 · 1605b47
1 parent cccd0ab
commit 1605b47
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/8.txt b/.changelog/8.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+`webhook` - Fix kube client apply for mutating manifest.
+```
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
       - run: go mod download
-      - run: go build -v .
+      - run: make
       - name: Run linters
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 examples/
 bin/
 dist/
-config/manifests/mutatingWebhookConfiguration.yaml
+config/manifests/mutatingWebhookConfiguration.yaml
diff --git a/cmd/webhook/certificate.go b/cmd/webhook/certificate.go
@@ -90,6 +90,7 @@ func generateCert(orgs, dnsNames []string, commonName string) (*bytes.Buffer, *b
 	// print CA certificate if insideCluster is false
 	if !insideCluster {
 		writeNewCA(caPEM, manifestWebhookPath)
+		time.Sleep(2 * time.Second)
 		applyManifest(manifestWebhookPath)
 
 		debugLogger.Printf("CA certificate Encoded: %s", base64.StdEncoding.EncodeToString(caPEM.Bytes()))

diff --git a/config/manifests/mutatingWebhookConfiguration.yaml b/config/manifests/mutatingWebhookConfiguration.yaml
@@ -16,7 +16,7 @@ webhooks:
       #   path: /mutate
       #   port: 8443
       # CA certificate with BEGIN and END lines - base64 encoded
-      caBundle: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZFekNDQXZ1Z0F3SUJBZ0lDQitZd0RRWUpLb1pJaHZjTkFRRUxCUUF3R3pFWk1CY0dBMVVFQ2hNUWVXOTEKY2k1bGVHRnRjR3hsTG1OdmJUQWVGdzB5TkRBNU1qY3dOalUyTURaYUZ3MHlOVEE1TWpjd05qVTJNRFphTUJzeApHVEFYQmdOVkJBb1RFSGx2ZFhJdVpYaGhiWEJzWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDCkR3QXdnZ0lLQW9JQ0FRQzh6eC9GRlVDOGkwOUJZSGt6aVVkdE9OWTlFelZqalJDb0FWZExyUUxLL3J5NzJLblAKc3ZpYkRTMHBDblJpMzZMRzczTHpjT3JDTlVEb1luWmdNWUhibElwMGdtNmpxZ0syQzRhUlMwTC9XZ2dWOWZyeApRQ05NTUhydlcyNldVMlFPWmRDcjAxdkdheTlRZDBPdlNldnpwSzhwZmlmbktramsyNFI3bjUrcmdsejJ0M3JJCjRPYTNNa0Z1U0Nic0dJWVI5djNPYVBJdVNuYk03SUYyVkNRWlM4eTc2M3VjVVU2SmFzbnVKblZyYjRGS242bXMKa1RJMmRsQzJaK3VMRm9FY3pocHRPZnNWeDF2MlBJZExRdmMzQnN5ZDJsSjVRY3B0bVhxelJFa3kyZXhDcVZuOQpNUkl6MzFZUVlnakE0M2I2ajVtcnhrY244eTlvaUpaNXJoU2podEZxRGNuVUFXVm1RWlhacTlUSVMzWjRLYVBrCjZWRm0vY1NYcUE1YzRONkpjc2ZxbGxLZituQkJJck02MUw3VmJqdlZYMlpGb3BzeWZQYmFnZElmRml4U3A4dHUKTmp2WHZKQ0ZhcWpmeGtBZWpWeGdxTWsrWG9EU2k0ZXVpSzV6UFducXdoditRZ1l6T2ZXRkJlUnBFT2ZJN1JQSwpXTUhOV25uQXlUcWZzeUlJSy9BRHh0RVNUdEVUd2FEWktveWVBbml6SDR2MC84UUNkWndwQXFWeC9hNDNoZzdCCmlYOTBqM2VleWFUdmVDa2VLQ0dWazY5YXh2RHdmL3hncVlEbGVhRVh1emR5WEhWWWU0WllpRlZaV1p2SW16NmgKSWlQL2o0cGdTaGlvVExicW5EV3Vrc3JWSThvL0ovMy9yb2R6SHg4TVFZdXB6OUlwa2tPbWFHamxDUUlEQVFBQgpvMkV3WHpBT0JnTlZIUThCQWY4RUJBTUNBb1F3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdJR0NDc0dBUVVGCkJ3TUJNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGQXJwRktoU3RQYmRUR2ltSUJUMGdaZzYKN1Z1bk1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQ0FRQm0zcW85R3ZLTDVIRVAxTXN0VmJ4aDArdzRJZVlJYWo4WQpnMnBucm0vVjNjUStqWjdsRDh4R1ljMUpRdmttNTRFRlE3WFM2T0RzcU5IWnNlWm1JTWoxTlp3YjJ5WUlrbnpoCjhDMm1QOEJFcUV6T085bngzcXBxUStjQkZLMENEOSsxaEpOWHNMUEE4OEN0ZWJCdWxCUjR4TUp5YmVWRWZlVjcKOWNFWWdrUHJBTFlQMEphVjRmajNFZTM1bzJkM0VqQkRzTXc1amFyNFNlMDljVzN2VXNZdFFaMWVxRmFvSmIrNgprbEZWVUN4S2VncFZFcmJyNUQ0V1B0Wk5xZjZXNDZQeDVieGdmVXBXTDJhRGY1UnNzempnUGluaGJtMEV3OXdyCjVZZjFJV0RkeFVjeUNLM0x1VDdQOENWa3ErL2tUNGgxcDlGRkdXSS9TS2ZtY0JnT0NMbG1KSC83QTZ1L3NmclIKd25OeVJwcW9Kb2FHc2xTNG85dkc1RDVUcFJVN0FNb2Qwc1NTUmphbGJaQ3F6blBQek5JdEVja1c2QXdoUGM1awpYQ1lnZ3YzTGxMWDc3VFduODVJa2RreE5IN1BlQm0vWGlmY0QycXg2eWFxM0FnS2RGYjJVVmI3VUQvU0ZUT05BCmpzNzNJN3pSVmMzazcwZjViTVFnYnNsZ2wwMHN3eXhGUitVUUZNTTVSakJMMWE2NGxkc0ZvUnVKMmdqUnIxOHoKcnNwbXJIc3kyZktqc2F1L0tydzVYZ3ZJSDdDQVhrd29NQjQyUWJxVWZNYUpINCsrN3lLSTVXaVJTUWJjMHdqcQphR2tpMkhvTmZVMGhKUTFwc2ZXOHNIbFEvaXo4L3ZQb3NLWjJmdFVpc082azR6QVJsK2hUdVFFRXYxZ0hGMWhmCnppKytzWDZnUkE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
+      caBundle: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZFekNDQXZ1Z0F3SUJBZ0lDQitZd0RRWUpLb1pJaHZjTkFRRUxCUUF3R3pFWk1CY0dBMVVFQ2hNUWVXOTEKY2k1bGVHRnRjR3hsTG1OdmJUQWVGdzB5TkRBNU1qY3dPVEV5TURsYUZ3MHlOVEE1TWpjd09URXlNRGxhTUJzeApHVEFYQmdOVkJBb1RFSGx2ZFhJdVpYaGhiWEJzWlM1amIyMHdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDCkR3QXdnZ0lLQW9JQ0FRQytmTjl6VTRHRXBpZXZ0S2Q1SnVnOE5sSFozNVdHcUp6MG5lSmo2dGpBK2Jkbjd3UmUKTHQ3STBQMk1Ta2hDWExqa2s3WmZqREtveEdlVGNZdzdYejI0UVVyR0J2Y3RpcFpJVWh6QkVmbVdYWWk3SlduUgpWSTRVMEw5cWFiclJZTTJ1am5Rc3RVTk9wS2U4Q1M3dStsNFNvMzFxNXFIRFF4dUJjTUJBS1YrbWs2V0JCWWU5CitNeDlWS1hLbFkrbUZBVU55NUFRaXFhRUcxQWE4Y3pZaGdMQTljdHBBWkNQWnF1a2twVUhiRzUvMWI4VVpZUHoKY2ZDcUNQTE8vd2dqbjN1R2ZqdCtFamZCRUdHZUJTU0xDdERhQVdMazlQUmxyZmdhOURJZ0Z0VTJwK3kxc0hLcgpBd0F3bG0zRG1CVEpNYWQ3Tks5TnloSmFRaXF4bVZ2QkgwdXRMSGpjdlRHNTlreDBWSmhhYjVVWVZKNFh2TmRYCjZRS2Rzc1Jldmd1TWo2VlJYd0RKcWtyTS9YRmdqcUJrVTUzSUQ1MlhXa3BUSHRQWTZkeWdrNmM4VkdFNjR6VnkKYWc5b2FIMzltT2piUmxFbG9hMGpnR0ltdTdiUUk4a3QrWjhiOVZRUWl4eTlvOTRRVmlYSVU0RUc0N2RaZUhQbwpMaXByZXNkdDJ0cDJwY2NPbDR0eUZUenNaRkVNK29PQ052MzlzTXc0bUI0dVRyd1V5MDA1d0FsVjJqTkxyN1Q0CjVYK3RtSGwvOXpLZnJmckxCbEJqN2lESytlTWNyaXM0SDVMdGx1dm9QWHBhZk4vMk9wTUY4MGxJd2ZDV01WdTEKSXpJS2kxWXhWSnBiR3VBOTduampZY0FZY1BWMExZYmNYc0s1UVNFeE1ZcXJQSHlsSEpROUtaUHJud0lEQVFBQgpvMkV3WHpBT0JnTlZIUThCQWY4RUJBTUNBb1F3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdJR0NDc0dBUVVGCkJ3TUJNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGSms3SjQySER0Q0FMVjRtTlNrTGlsdkYKWjFReU1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQ0FRQlVvSlg3bGlmQ2UrM3FuMWhpTzY0MStLZm9iM3N6V3F0bwp4eUdvZU5IRU03S2d2dDNBdkNpSWg1b0Z2SXc4Tlc4Zjh1N2ltUk1UZ1BoaEJrTWZZckJrSU9JK2VtaUpwZStlCm9Hck0xWFlTQXJ1ZitKalpuOVNPY2I0Mlpnb1NCeHI2cVdNMDdpZm9lU2E4YmJwbEh3Y085SDFJWU1TRWsxazQKdnd1Z2RaNjlIOVp1N3hvaHRRODVwZEpUcWw1Z3laSi9xMno0YnNUSSthMWdRM29OQzE0QVJXVnZtRU5xTTdZbgp4eGNGOWV4UWRMUUdoVnpveUFVZ2RkZlB6YjVXVG5vVHBOTThEdVdmMHdSUTE0b2JOdXduUGpUNFF6ekI2VlIxCkVjdjFWeUpYVlVxNGlGRldBQTBEbmI2MnhoekFtMjN2c0dOMGJjUHR6K3h4V3BpN2JJYi9FcklGTytIYXE2UVcKVUlSVXVjckZOeExYZlZuR3RWRkpGSjI1NlFHdW11L21DSUdwckl1TTVsRTFjc0VJWWNUKzdyNm5CemZyWVMzbAp0TC9GeFhqWjJvekdNaHNyNTZMN2x6SjNiZkJZSzJ0eHlPakxKdWQ1L04zSWxiS2Nna0YvSnZYYnZyam0yWUMxCitsd1d4TUxxbjhqenl3YnlveDQvRUgxVXR0Tm8xK3U2WFAzWmpCU2pkUTErYmMzZktsUGgwWTNMaVlzWm5JYlEKN3BPRjFiRTR5OWxoSHpweFBObWwrTHN2SmVyQzlWV0ZYcUg3d2lUOXBaRE5QaEdWTTNFMEFJbENZSFZBV1F0TQpBV1ZNSVpyeVFpb0JFNTdMaFNCeVJFdGxkYkVnbEpIWTQ0cFFmOFUxL2dvb3VKcW1sbmdyejI0YWduL2Y0UW1ZCjZSd08wTUtDZHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
     rules:
       - operations: [ "CREATE", "UPDATE"]
         apiGroups: [""]