Merge pull request #1822 from kube-logging/fix/kustomize-build-for-la…

…test-version

fix: adjust kustomize config for latest version

config/crd/kustomization.yaml

@@ -22,23 +22,23 @@ resources:
 
 patches:
 # [WEBHOOK] patches here are for enabling the conversion webhook for each CRD
-#- patches/webhook_in_fluentbits.yaml
-#- patches/webhook_in_flows.yaml
-#- patches/webhook_in_clusterflows.yaml
-#- patches/webhook_in_outputs.yaml
-#- patches/webhook_in_clusteroutputs.yaml
-#- patches/webhook_in_fluentds.yaml
-#- patches/webhook_in_loggings.yaml
+# - path: patches/webhook_in_fluentbits.yaml
+# - path: patches/webhook_in_flows.yaml
+# - path: patches/webhook_in_clusterflows.yaml
+# - path: patches/webhook_in_outputs.yaml
+# - path: patches/webhook_in_clusteroutputs.yaml
+# - path: patches/webhook_in_fluentds.yaml
+# - path: patches/webhook_in_loggings.yaml
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CAINJECTION] patches here are for enabling the CA injection for each CRD
-#- patches/cainjection_in_fluentbits.yaml
-#- patches/cainjection_in_flows.yaml
-#- patches/cainjection_in_clusterflows.yaml
-#- patches/cainjection_in_outputs.yaml
-#- patches/cainjection_in_clusteroutputs.yaml
-#- patches/cainjection_in_fluentds.yaml
-#- patches/cainjection_in_loggings.yaml
+# - path: patches/cainjection_in_fluentbits.yaml
+# - path: patches/cainjection_in_flows.yaml
+# - path: patches/cainjection_in_clusterflows.yaml
+# - path: patches/cainjection_in_outputs.yaml
+# - path: patches/cainjection_in_clusteroutputs.yaml
+# - path: patches/cainjection_in_fluentds.yaml
+# - path: patches/cainjection_in_loggings.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/crd/patches/webhook_in_clusterflows.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/crd/patches/webhook_in_clusteroutputs.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/crd/patches/webhook_in_flows.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/crd/patches/webhook_in_fluentbits.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/crd/patches/webhook_in_fluentds.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/crd/patches/webhook_in_loggings.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/crd/patches/webhook_in_outputs.yaml

@@ -8,7 +8,7 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # this "\n" is used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
       # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
       caBundle: Cg==
       service:

config/default/kustomization.yaml

@@ -12,32 +12,32 @@ namePrefix: logging-operator-ws-
 #commonLabels:
 #  someName: someValue
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
-#- ../webhook
+# - ../webhook
 # [CERTMANAGER] To enable cert-manager, uncomment next line. 'WEBHOOK' components are required.
-#- ../certmanager
+# - ../certmanager
 
 patches:
-- manager_image_patch.yaml
+- path: manager_image_patch.yaml
   # Protect the /metrics endpoint by putting it behind auth.
   # Only one of manager_auth_proxy_patch.yaml and
   # manager_prometheus_metrics_patch.yaml should be enabled.
-- manager_auth_proxy_patch.yaml
+- path: manager_auth_proxy_patch.yaml
   # If you want your controller-manager to expose the /metrics
   # endpoint w/o any authn/z, uncomment the following line and
   # comment manager_auth_proxy_patch.yaml.
   # Only one of manager_auth_proxy_patch.yaml and
   # manager_prometheus_metrics_patch.yaml should be enabled.
-#- manager_prometheus_metrics_patch.yaml
+# - path: manager_prometheus_metrics_patch.yaml
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
-#- manager_webhook_patch.yaml
+# - path: manager_webhook_patch.yaml
 
 # [CAINJECTION] Uncomment next line to enable the CA injection in the admission webhooks.
 # Uncomment 'CAINJECTION' in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
 # 'CERTMANAGER' needs to be enabled to use ca injection
-#- webhookcainjection_patch.yaml
+# - path: webhookcainjection_patch.yaml