Make necessary skaffold changes

gardener · Jul 11, 2024 · a7fddef · a7fddef
1 parent 4d8e51e
commit a7fddef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -25,9 +25,11 @@ Files:
   example/extension/extension-config-patch.yaml.tmpl
   example/local/charts/rsyslog-relp-echo-server/.helmignore
   example/controller-registration.yaml
+  example/kustomization.yaml
   hack/api-reference/*.json
   hack/cherry-pick-pull.sh
   test/integration/controller/lifecycle/resources/*.yaml
+  local-setup
   go.mod
   go.sum
   skaffold.yaml

diff --git a/local-setup/kustomization.yaml b/local-setup/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 patches:
 - patch: |
     - op: replace
-      path: /providerConfig/values/image
-      value: local-skaffold/gardener/extensions/shoot-rsyslog-relp
+      path: /helm/values/image
+      value: local-skaffold/gardener-extension-shoot-rsyslog-relp
   target:
     group: core.gardener.cloud
     kind: ControllerDeployment

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -4,10 +4,10 @@ metadata:
   name: rsyslog-relp-echo-server
 build:
   artifacts:
-    - image: local-skaffold/gardener/extensions/shoot-rsyslog-relp-echo-server
+    - image: local-skaffold/gardener-extension-shoot-rsyslog-relp-echo-server
       docker:
         cacheFrom:
-          - local-skaffold/gardener/extensions/shoot-rsyslog-relp-echo-server
+          - local-skaffold/gardener-extension-shoot-rsyslog-relp-echo-server
   local: {}
 deploy:
   helm:
@@ -18,7 +18,7 @@ deploy:
         wait: true
         chartPath: example/local/charts/rsyslog-relp-echo-server
         setValueTemplates:
-          images.rsyslog: '{{.IMAGE_FULLY_QUALIFIED_local_skaffold_gardener_extensions_shoot_rsyslog_relp_echo_server}}'
+          images.rsyslog: '{{.IMAGE_FULLY_QUALIFIED_local_skaffold_gardener_extension_shoot_rsyslog_relp_echo_server}}'
         setValues:
           service.clusterIP: 10.2.64.54
 ---
@@ -28,7 +28,7 @@ metadata:
   name: extension
 build:
   artifacts:
-    - image: local-skaffold/gardener/extensions/shoot-rsyslog-relp
+    - image: local-skaffold/gardener-extension-shoot-rsyslog-relp
       ko:
         dependencies:
           paths:
@@ -45,8 +45,16 @@ build:
             - pkg/controller/config
             - pkg/controller/lifecycle
             - imagevector
+            - imagevector/images.yaml
             - pkg/utils
             - pkg/webhook/operatingsystemconfig
+            - pkg/webhook/operatingsystemconfig/resources/auditrules/00-base-config.rules
+            - pkg/webhook/operatingsystemconfig/resources/auditrules/10-privilege-escalation.rules
+            - pkg/webhook/operatingsystemconfig/resources/auditrules/11-privileged-special.rules
+            - pkg/webhook/operatingsystemconfig/resources/auditrules/12-system-integrity.rules
+            - pkg/webhook/operatingsystemconfig/resources/templates/60-audit.conf.tpl
+            - pkg/webhook/operatingsystemconfig/resources/templates/scripts/configure-rsyslog.tpl.sh
+            - pkg/webhook/operatingsystemconfig/resources/templates/scripts/process-rsyslog-pstats.tpl.sh
             - VERSION
         ldflags:
           - '{{.LD_FLAGS}}'
@@ -69,7 +77,7 @@ metadata:
   name: admission
 build:
   artifacts:
-    - image: local-skaffold/gardener/extensions/shoot-rsyslog-relp-admission
+    - image: local-skaffold/gardener-extension-shoot-rsyslog-relp-admission
       ko:
         dependencies:
           paths:
@@ -95,8 +103,8 @@ deploy:
         wait: true
         chartPath: charts/gardener-extension-shoot-rsyslog-relp-admission
         setValueTemplates:
-          global.image.repository: '{{.IMAGE_REPO_local_skaffold_gardener_extensions_shoot_rsyslog_relp_admission}}'
-          global.image.tag: '{{.IMAGE_TAG_local_skaffold_gardener_extensions_shoot_rsyslog_relp_admission}}@{{.IMAGE_DIGEST_local_skaffold_gardener_extensions_shoot_rsyslog_relp_admission}}'
+          global.image.repository: '{{.IMAGE_REPO_local_skaffold_gardener_extension_shoot_rsyslog_relp_admission}}'
+          global.image.tag: '{{.IMAGE_TAG_local_skaffold_gardener_extension_shoot_rsyslog_relp_admission}}@{{.IMAGE_DIGEST_local_skaffold_gardener_extension_shoot_rsyslog_relp_admission}}'
 profiles:
   - name: remote-extension
     patches: