From cc9e614439236f6e3a3f1f82a15be981ca8b3feb Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 7 Aug 2025 12:04:21 +0300 Subject: [PATCH 1/2] deployment: add minimal kustomize overlays for deploying plugins Signed-off-by: Markus Lehtonen --- .../kustomize/device-injector/daemonset.yaml | 32 +++++++++++ .../device-injector/kustomization.yaml | 13 +++++ contrib/kustomize/differ/daemonset.yaml | 29 ++++++++++ contrib/kustomize/differ/kustomization.yaml | 13 +++++ .../kustomize/hook-injector/daemonset.yaml | 53 +++++++++++++++++++ .../hook-injector/kustomization.yaml | 13 +++++ contrib/kustomize/logger/daemonset.yaml | 33 ++++++++++++ contrib/kustomize/logger/kustomization.yaml | 13 +++++ .../network-device-injector/daemonset.yaml | 32 +++++++++++ .../kustomization.yaml | 13 +++++ .../kustomize/network-logger/daemonset.yaml | 31 +++++++++++ .../network-logger/kustomization.yaml | 13 +++++ contrib/kustomize/template/daemonset.yaml | 31 +++++++++++ contrib/kustomize/template/kustomization.yaml | 13 +++++ .../kustomize/ulimit-adjuster/daemonset.yaml | 32 +++++++++++ .../ulimit-adjuster/kustomization.yaml | 13 +++++ contrib/kustomize/v010-adapter/daemonset.yaml | 46 ++++++++++++++++ .../kustomize/v010-adapter/kustomization.yaml | 13 +++++ 18 files changed, 436 insertions(+) create mode 100644 contrib/kustomize/device-injector/daemonset.yaml create mode 100644 contrib/kustomize/device-injector/kustomization.yaml create mode 100644 contrib/kustomize/differ/daemonset.yaml create mode 100644 contrib/kustomize/differ/kustomization.yaml create mode 100644 contrib/kustomize/hook-injector/daemonset.yaml create mode 100644 contrib/kustomize/hook-injector/kustomization.yaml create mode 100644 contrib/kustomize/logger/daemonset.yaml create mode 100644 contrib/kustomize/logger/kustomization.yaml create mode 100644 contrib/kustomize/network-device-injector/daemonset.yaml create mode 100644 contrib/kustomize/network-device-injector/kustomization.yaml create mode 100644 contrib/kustomize/network-logger/daemonset.yaml create mode 100644 contrib/kustomize/network-logger/kustomization.yaml create mode 100644 contrib/kustomize/template/daemonset.yaml create mode 100644 contrib/kustomize/template/kustomization.yaml create mode 100644 contrib/kustomize/ulimit-adjuster/daemonset.yaml create mode 100644 contrib/kustomize/ulimit-adjuster/kustomization.yaml create mode 100644 contrib/kustomize/v010-adapter/daemonset.yaml create mode 100644 contrib/kustomize/v010-adapter/kustomization.yaml diff --git a/contrib/kustomize/device-injector/daemonset.yaml b/contrib/kustomize/device-injector/daemonset.yaml new file mode 100644 index 00000000..2f58c30a --- /dev/null +++ b/contrib/kustomize/device-injector/daemonset.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-device-injector +spec: + template: + spec: + priorityClassName: system-node-critical + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/device-injector/kustomization.yaml b/contrib/kustomize/device-injector/kustomization.yaml new file mode 100644 index 00000000..afe97631 --- /dev/null +++ b/contrib/kustomize/device-injector/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/device-injector + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-device-injector diff --git a/contrib/kustomize/differ/daemonset.yaml b/contrib/kustomize/differ/daemonset.yaml new file mode 100644 index 00000000..5af6d036 --- /dev/null +++ b/contrib/kustomize/differ/daemonset.yaml @@ -0,0 +1,29 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-differ +spec: + template: + spec: + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: [] + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/differ/kustomization.yaml b/contrib/kustomize/differ/kustomization.yaml new file mode 100644 index 00000000..bb099a97 --- /dev/null +++ b/contrib/kustomize/differ/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/differ + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-differ diff --git a/contrib/kustomize/hook-injector/daemonset.yaml b/contrib/kustomize/hook-injector/daemonset.yaml new file mode 100644 index 00000000..500e8335 --- /dev/null +++ b/contrib/kustomize/hook-injector/daemonset.yaml @@ -0,0 +1,53 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-hook-injector +spec: + template: + spec: + priorityClassName: system-node-critical + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + - name: etc-hooks-d + mountPath: /etc/containers/oci/hooks.d + readOnly: true + - name: usr-share-hooks-d + mountPath: /usr/share/containers/oci/hooks.d + readOnly: true + - name: libexec-hooks-d + mountPath: /usr/libexec/oci/hooks.d + readOnly: true + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket + - name: etc-hooks-d + hostPath: + path: /etc/containers/oci/hooks.d + type: DirectoryOrCreate + - name: usr-share-hooks-d + hostPath: + path: /usr/share/containers/oci/hooks.d + type: DirectoryOrCreate + - name: libexec-hooks-d + hostPath: + path: /usr/libexec/oci/hooks.d + type: DirectoryOrCreate diff --git a/contrib/kustomize/hook-injector/kustomization.yaml b/contrib/kustomize/hook-injector/kustomization.yaml new file mode 100644 index 00000000..3002a6ce --- /dev/null +++ b/contrib/kustomize/hook-injector/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/hook-injector + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-hook-injector diff --git a/contrib/kustomize/logger/daemonset.yaml b/contrib/kustomize/logger/daemonset.yaml new file mode 100644 index 00000000..f419d841 --- /dev/null +++ b/contrib/kustomize/logger/daemonset.yaml @@ -0,0 +1,33 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-logger +spec: + template: + spec: + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + - "-events" + - "RunPodSandbox,StopPodSandbox,RemovePodSandbox,CreateContainer,PostCreateContainer,StartContainer,PostStartContainer,UpdateContainer,PostUpdateContainer,StopContainer,RemoveContainer" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/logger/kustomization.yaml b/contrib/kustomize/logger/kustomization.yaml new file mode 100644 index 00000000..fc5d21a9 --- /dev/null +++ b/contrib/kustomize/logger/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/logger + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-logger diff --git a/contrib/kustomize/network-device-injector/daemonset.yaml b/contrib/kustomize/network-device-injector/daemonset.yaml new file mode 100644 index 00000000..17dbf0d2 --- /dev/null +++ b/contrib/kustomize/network-device-injector/daemonset.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-network-device-injector +spec: + template: + spec: + priorityClassName: system-node-critical + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/network-device-injector/kustomization.yaml b/contrib/kustomize/network-device-injector/kustomization.yaml new file mode 100644 index 00000000..a5badace --- /dev/null +++ b/contrib/kustomize/network-device-injector/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/network-device-injector + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-network-device-injector diff --git a/contrib/kustomize/network-logger/daemonset.yaml b/contrib/kustomize/network-logger/daemonset.yaml new file mode 100644 index 00000000..26ccf1ec --- /dev/null +++ b/contrib/kustomize/network-logger/daemonset.yaml @@ -0,0 +1,31 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-network-logger +spec: + template: + spec: + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/network-logger/kustomization.yaml b/contrib/kustomize/network-logger/kustomization.yaml new file mode 100644 index 00000000..5191f091 --- /dev/null +++ b/contrib/kustomize/network-logger/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/network-logger + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-network-logger diff --git a/contrib/kustomize/template/daemonset.yaml b/contrib/kustomize/template/daemonset.yaml new file mode 100644 index 00000000..86b057d6 --- /dev/null +++ b/contrib/kustomize/template/daemonset.yaml @@ -0,0 +1,31 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-template +spec: + template: + spec: + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/template/kustomization.yaml b/contrib/kustomize/template/kustomization.yaml new file mode 100644 index 00000000..30c333c3 --- /dev/null +++ b/contrib/kustomize/template/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/template + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-template diff --git a/contrib/kustomize/ulimit-adjuster/daemonset.yaml b/contrib/kustomize/ulimit-adjuster/daemonset.yaml new file mode 100644 index 00000000..8f63f058 --- /dev/null +++ b/contrib/kustomize/ulimit-adjuster/daemonset.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-ulimit-adjuster +spec: + template: + spec: + priorityClassName: system-node-critical + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket diff --git a/contrib/kustomize/ulimit-adjuster/kustomization.yaml b/contrib/kustomize/ulimit-adjuster/kustomization.yaml new file mode 100644 index 00000000..7fafc9a3 --- /dev/null +++ b/contrib/kustomize/ulimit-adjuster/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/ulimit-adjuster + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-ulimit-adjuster diff --git a/contrib/kustomize/v010-adapter/daemonset.yaml b/contrib/kustomize/v010-adapter/daemonset.yaml new file mode 100644 index 00000000..864007cc --- /dev/null +++ b/contrib/kustomize/v010-adapter/daemonset.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: nri-plugin-v010-adapter +spec: + template: + spec: + priorityClassName: system-node-critical + containers: + - name: plugin + image: plugin:latest + imagePullPolicy: Always + args: + - "-idx" + - "10" + resources: + requests: + cpu: "2m" + memory: "5Mi" + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + volumeMounts: + - name: nri-socket + mountPath: /var/run/nri/nri.sock + - name: nri-v010-config + mountPath: /etc/nri/conf.json + readOnly: true + - name: nri-v010-plugins + mountPath: /opt/nri/bin + readOnly: true + volumes: + - name: nri-socket + hostPath: + path: /var/run/nri/nri.sock + type: Socket + - name: nri-v010-config + hostPath: + path: /etc/nri/conf.json + type: File + - name: nri-v010-plugins + hostPath: + path: /opt/nri/bin + type: DirectoryOrCreate diff --git a/contrib/kustomize/v010-adapter/kustomization.yaml b/contrib/kustomize/v010-adapter/kustomization.yaml new file mode 100644 index 00000000..d56ca05e --- /dev/null +++ b/contrib/kustomize/v010-adapter/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/v010-adapter + newTag: unstable +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-v010-adapter From be0d68def8a13635e232d035dacab5b852629580 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 14 Aug 2025 11:00:39 +0300 Subject: [PATCH 2/2] contrib/kustomize: separate overlays for stable and unstable images Define separate overlays for stable (released) and unstable images. Utilizes reusable kustomize components to minimize repetition. The stable image would always point to the latest tagged release and unstable use the latest development build from main. The image-stable will need to be updated just before tagging a release (so that the released version points to the correct image). Usage would be like: 1. Install the latest release kubectl create -k "https://github.com/containerd/nri/contrib/kustomize/hook-injector" 2. Install a specific release kubectl create -k "https://github.com/containerd/nri/contrib/kustomize/hook-injector?ref=v0.10.0" 3. Install the latest development build: kubectl create -k "https://github.com/containerd/nri/contrib/kustomize/hook-injector/unstable" Signed-off-by: Markus Lehtonen --- .../components/image-stable/kustomization.yaml | 12 ++++++++++++ .../components/image-unstable/kustomization.yaml | 12 ++++++++++++ .../device-injector/{ => base}/daemonset.yaml | 1 - .../device-injector/base/kustomization.yaml | 12 ++++++++++++ .../kustomize/device-injector/kustomization.yaml | 13 +++---------- .../device-injector/unstable/kustomization.yaml | 6 ++++++ contrib/kustomize/differ/{ => base}/daemonset.yaml | 1 - contrib/kustomize/differ/base/kustomization.yaml | 12 ++++++++++++ contrib/kustomize/differ/kustomization.yaml | 13 +++---------- .../kustomize/differ/unstable/kustomization.yaml | 6 ++++++ .../hook-injector/{ => base}/daemonset.yaml | 1 - .../kustomize/hook-injector/base/kustomization.yaml | 12 ++++++++++++ contrib/kustomize/hook-injector/kustomization.yaml | 13 +++---------- .../hook-injector/unstable/kustomization.yaml | 6 ++++++ contrib/kustomize/logger/{ => base}/daemonset.yaml | 1 - contrib/kustomize/logger/base/kustomization.yaml | 12 ++++++++++++ contrib/kustomize/logger/kustomization.yaml | 13 +++---------- .../kustomize/logger/unstable/kustomization.yaml | 6 ++++++ .../{ => base}/daemonset.yaml | 1 - .../network-device-injector/base/kustomization.yaml | 12 ++++++++++++ .../network-device-injector/kustomization.yaml | 13 +++---------- .../unstable/kustomization.yaml | 6 ++++++ .../network-logger/{ => base}/daemonset.yaml | 1 - .../network-logger/base/kustomization.yaml | 12 ++++++++++++ contrib/kustomize/network-logger/kustomization.yaml | 13 +++---------- .../network-logger/unstable/kustomization.yaml | 6 ++++++ .../kustomize/template/{ => base}/daemonset.yaml | 1 - contrib/kustomize/template/base/kustomization.yaml | 12 ++++++++++++ contrib/kustomize/template/kustomization.yaml | 13 +++---------- .../kustomize/template/unstable/kustomization.yaml | 6 ++++++ .../ulimit-adjuster/{ => base}/daemonset.yaml | 1 - .../ulimit-adjuster/base/kustomization.yaml | 12 ++++++++++++ .../kustomize/ulimit-adjuster/kustomization.yaml | 13 +++---------- .../ulimit-adjuster/unstable/kustomization.yaml | 6 ++++++ .../v010-adapter/{ => base}/daemonset.yaml | 1 - .../kustomize/v010-adapter/base/kustomization.yaml | 12 ++++++++++++ contrib/kustomize/v010-adapter/kustomization.yaml | 13 +++---------- .../v010-adapter/unstable/kustomization.yaml | 6 ++++++ 38 files changed, 213 insertions(+), 99 deletions(-) create mode 100644 contrib/kustomize/components/image-stable/kustomization.yaml create mode 100644 contrib/kustomize/components/image-unstable/kustomization.yaml rename contrib/kustomize/device-injector/{ => base}/daemonset.yaml (95%) create mode 100644 contrib/kustomize/device-injector/base/kustomization.yaml create mode 100644 contrib/kustomize/device-injector/unstable/kustomization.yaml rename contrib/kustomize/differ/{ => base}/daemonset.yaml (95%) create mode 100644 contrib/kustomize/differ/base/kustomization.yaml create mode 100644 contrib/kustomize/differ/unstable/kustomization.yaml rename contrib/kustomize/hook-injector/{ => base}/daemonset.yaml (97%) create mode 100644 contrib/kustomize/hook-injector/base/kustomization.yaml create mode 100644 contrib/kustomize/hook-injector/unstable/kustomization.yaml rename contrib/kustomize/logger/{ => base}/daemonset.yaml (96%) create mode 100644 contrib/kustomize/logger/base/kustomization.yaml create mode 100644 contrib/kustomize/logger/unstable/kustomization.yaml rename contrib/kustomize/network-device-injector/{ => base}/daemonset.yaml (95%) create mode 100644 contrib/kustomize/network-device-injector/base/kustomization.yaml create mode 100644 contrib/kustomize/network-device-injector/unstable/kustomization.yaml rename contrib/kustomize/network-logger/{ => base}/daemonset.yaml (95%) create mode 100644 contrib/kustomize/network-logger/base/kustomization.yaml create mode 100644 contrib/kustomize/network-logger/unstable/kustomization.yaml rename contrib/kustomize/template/{ => base}/daemonset.yaml (95%) create mode 100644 contrib/kustomize/template/base/kustomization.yaml create mode 100644 contrib/kustomize/template/unstable/kustomization.yaml rename contrib/kustomize/ulimit-adjuster/{ => base}/daemonset.yaml (95%) create mode 100644 contrib/kustomize/ulimit-adjuster/base/kustomization.yaml create mode 100644 contrib/kustomize/ulimit-adjuster/unstable/kustomization.yaml rename contrib/kustomize/v010-adapter/{ => base}/daemonset.yaml (97%) create mode 100644 contrib/kustomize/v010-adapter/base/kustomization.yaml create mode 100644 contrib/kustomize/v010-adapter/unstable/kustomization.yaml diff --git a/contrib/kustomize/components/image-stable/kustomization.yaml b/contrib/kustomize/components/image-stable/kustomization.yaml new file mode 100644 index 00000000..c4f7494a --- /dev/null +++ b/contrib/kustomize/components/image-stable/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +images: + - name: '*' + newTag: v0.10.0 +patches: + - target: + kind: DaemonSet + patch: | + - op: replace + path: /spec/template/spec/containers/0/imagePullPolicy + value: IfNotPresent diff --git a/contrib/kustomize/components/image-unstable/kustomization.yaml b/contrib/kustomize/components/image-unstable/kustomization.yaml new file mode 100644 index 00000000..eeb78e65 --- /dev/null +++ b/contrib/kustomize/components/image-unstable/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +images: + - name: '*' + newTag: unstable +patches: + - target: + kind: DaemonSet + patch: | + - op: replace + path: /spec/template/spec/containers/0/imagePullPolicy + value: Always diff --git a/contrib/kustomize/device-injector/daemonset.yaml b/contrib/kustomize/device-injector/base/daemonset.yaml similarity index 95% rename from contrib/kustomize/device-injector/daemonset.yaml rename to contrib/kustomize/device-injector/base/daemonset.yaml index 2f58c30a..936fd7c8 100644 --- a/contrib/kustomize/device-injector/daemonset.yaml +++ b/contrib/kustomize/device-injector/base/daemonset.yaml @@ -9,7 +9,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/device-injector/base/kustomization.yaml b/contrib/kustomize/device-injector/base/kustomization.yaml new file mode 100644 index 00000000..54b4aa03 --- /dev/null +++ b/contrib/kustomize/device-injector/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/device-injector +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-device-injector diff --git a/contrib/kustomize/device-injector/kustomization.yaml b/contrib/kustomize/device-injector/kustomization.yaml index afe97631..59fa03d6 100644 --- a/contrib/kustomize/device-injector/kustomization.yaml +++ b/contrib/kustomize/device-injector/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/device-injector - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-device-injector + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/device-injector/unstable/kustomization.yaml b/contrib/kustomize/device-injector/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/device-injector/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/differ/daemonset.yaml b/contrib/kustomize/differ/base/daemonset.yaml similarity index 95% rename from contrib/kustomize/differ/daemonset.yaml rename to contrib/kustomize/differ/base/daemonset.yaml index 5af6d036..e0642da1 100644 --- a/contrib/kustomize/differ/daemonset.yaml +++ b/contrib/kustomize/differ/base/daemonset.yaml @@ -8,7 +8,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: [] resources: requests: diff --git a/contrib/kustomize/differ/base/kustomization.yaml b/contrib/kustomize/differ/base/kustomization.yaml new file mode 100644 index 00000000..4ed4d97c --- /dev/null +++ b/contrib/kustomize/differ/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/differ +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-device-injector diff --git a/contrib/kustomize/differ/kustomization.yaml b/contrib/kustomize/differ/kustomization.yaml index bb099a97..59fa03d6 100644 --- a/contrib/kustomize/differ/kustomization.yaml +++ b/contrib/kustomize/differ/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/differ - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-differ + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/differ/unstable/kustomization.yaml b/contrib/kustomize/differ/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/differ/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/hook-injector/daemonset.yaml b/contrib/kustomize/hook-injector/base/daemonset.yaml similarity index 97% rename from contrib/kustomize/hook-injector/daemonset.yaml rename to contrib/kustomize/hook-injector/base/daemonset.yaml index 500e8335..2f753e8d 100644 --- a/contrib/kustomize/hook-injector/daemonset.yaml +++ b/contrib/kustomize/hook-injector/base/daemonset.yaml @@ -9,7 +9,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/hook-injector/base/kustomization.yaml b/contrib/kustomize/hook-injector/base/kustomization.yaml new file mode 100644 index 00000000..efb99c69 --- /dev/null +++ b/contrib/kustomize/hook-injector/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/hook-injector +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-hook-injector diff --git a/contrib/kustomize/hook-injector/kustomization.yaml b/contrib/kustomize/hook-injector/kustomization.yaml index 3002a6ce..59fa03d6 100644 --- a/contrib/kustomize/hook-injector/kustomization.yaml +++ b/contrib/kustomize/hook-injector/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/hook-injector - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-hook-injector + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/hook-injector/unstable/kustomization.yaml b/contrib/kustomize/hook-injector/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/hook-injector/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/logger/daemonset.yaml b/contrib/kustomize/logger/base/daemonset.yaml similarity index 96% rename from contrib/kustomize/logger/daemonset.yaml rename to contrib/kustomize/logger/base/daemonset.yaml index f419d841..08d982e9 100644 --- a/contrib/kustomize/logger/daemonset.yaml +++ b/contrib/kustomize/logger/base/daemonset.yaml @@ -8,7 +8,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/logger/base/kustomization.yaml b/contrib/kustomize/logger/base/kustomization.yaml new file mode 100644 index 00000000..b65fdeb3 --- /dev/null +++ b/contrib/kustomize/logger/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/logger +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-logger diff --git a/contrib/kustomize/logger/kustomization.yaml b/contrib/kustomize/logger/kustomization.yaml index fc5d21a9..59fa03d6 100644 --- a/contrib/kustomize/logger/kustomization.yaml +++ b/contrib/kustomize/logger/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/logger - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-logger + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/logger/unstable/kustomization.yaml b/contrib/kustomize/logger/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/logger/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/network-device-injector/daemonset.yaml b/contrib/kustomize/network-device-injector/base/daemonset.yaml similarity index 95% rename from contrib/kustomize/network-device-injector/daemonset.yaml rename to contrib/kustomize/network-device-injector/base/daemonset.yaml index 17dbf0d2..560b883c 100644 --- a/contrib/kustomize/network-device-injector/daemonset.yaml +++ b/contrib/kustomize/network-device-injector/base/daemonset.yaml @@ -9,7 +9,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/network-device-injector/base/kustomization.yaml b/contrib/kustomize/network-device-injector/base/kustomization.yaml new file mode 100644 index 00000000..614561bb --- /dev/null +++ b/contrib/kustomize/network-device-injector/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/network-device-injector +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-network-device-injector diff --git a/contrib/kustomize/network-device-injector/kustomization.yaml b/contrib/kustomize/network-device-injector/kustomization.yaml index a5badace..59fa03d6 100644 --- a/contrib/kustomize/network-device-injector/kustomization.yaml +++ b/contrib/kustomize/network-device-injector/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/network-device-injector - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-network-device-injector + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/network-device-injector/unstable/kustomization.yaml b/contrib/kustomize/network-device-injector/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/network-device-injector/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/network-logger/daemonset.yaml b/contrib/kustomize/network-logger/base/daemonset.yaml similarity index 95% rename from contrib/kustomize/network-logger/daemonset.yaml rename to contrib/kustomize/network-logger/base/daemonset.yaml index 26ccf1ec..ba441d7c 100644 --- a/contrib/kustomize/network-logger/daemonset.yaml +++ b/contrib/kustomize/network-logger/base/daemonset.yaml @@ -8,7 +8,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/network-logger/base/kustomization.yaml b/contrib/kustomize/network-logger/base/kustomization.yaml new file mode 100644 index 00000000..c4caa627 --- /dev/null +++ b/contrib/kustomize/network-logger/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/network-logger +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-network-logger diff --git a/contrib/kustomize/network-logger/kustomization.yaml b/contrib/kustomize/network-logger/kustomization.yaml index 5191f091..59fa03d6 100644 --- a/contrib/kustomize/network-logger/kustomization.yaml +++ b/contrib/kustomize/network-logger/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/network-logger - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-network-logger + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/network-logger/unstable/kustomization.yaml b/contrib/kustomize/network-logger/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/network-logger/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/template/daemonset.yaml b/contrib/kustomize/template/base/daemonset.yaml similarity index 95% rename from contrib/kustomize/template/daemonset.yaml rename to contrib/kustomize/template/base/daemonset.yaml index 86b057d6..f3bd1275 100644 --- a/contrib/kustomize/template/daemonset.yaml +++ b/contrib/kustomize/template/base/daemonset.yaml @@ -8,7 +8,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/template/base/kustomization.yaml b/contrib/kustomize/template/base/kustomization.yaml new file mode 100644 index 00000000..1cfada08 --- /dev/null +++ b/contrib/kustomize/template/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/template +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-template diff --git a/contrib/kustomize/template/kustomization.yaml b/contrib/kustomize/template/kustomization.yaml index 30c333c3..59fa03d6 100644 --- a/contrib/kustomize/template/kustomization.yaml +++ b/contrib/kustomize/template/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/template - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-template + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/template/unstable/kustomization.yaml b/contrib/kustomize/template/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/template/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/ulimit-adjuster/daemonset.yaml b/contrib/kustomize/ulimit-adjuster/base/daemonset.yaml similarity index 95% rename from contrib/kustomize/ulimit-adjuster/daemonset.yaml rename to contrib/kustomize/ulimit-adjuster/base/daemonset.yaml index 8f63f058..67cf61cd 100644 --- a/contrib/kustomize/ulimit-adjuster/daemonset.yaml +++ b/contrib/kustomize/ulimit-adjuster/base/daemonset.yaml @@ -9,7 +9,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/ulimit-adjuster/base/kustomization.yaml b/contrib/kustomize/ulimit-adjuster/base/kustomization.yaml new file mode 100644 index 00000000..e539b7ff --- /dev/null +++ b/contrib/kustomize/ulimit-adjuster/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/ulimit-adjuster +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-ulimit-adjuster diff --git a/contrib/kustomize/ulimit-adjuster/kustomization.yaml b/contrib/kustomize/ulimit-adjuster/kustomization.yaml index 7fafc9a3..59fa03d6 100644 --- a/contrib/kustomize/ulimit-adjuster/kustomization.yaml +++ b/contrib/kustomize/ulimit-adjuster/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/ulimit-adjuster - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-ulimit-adjuster + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/ulimit-adjuster/unstable/kustomization.yaml b/contrib/kustomize/ulimit-adjuster/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/ulimit-adjuster/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable diff --git a/contrib/kustomize/v010-adapter/daemonset.yaml b/contrib/kustomize/v010-adapter/base/daemonset.yaml similarity index 97% rename from contrib/kustomize/v010-adapter/daemonset.yaml rename to contrib/kustomize/v010-adapter/base/daemonset.yaml index 864007cc..eb62253e 100644 --- a/contrib/kustomize/v010-adapter/daemonset.yaml +++ b/contrib/kustomize/v010-adapter/base/daemonset.yaml @@ -9,7 +9,6 @@ spec: containers: - name: plugin image: plugin:latest - imagePullPolicy: Always args: - "-idx" - "10" diff --git a/contrib/kustomize/v010-adapter/base/kustomization.yaml b/contrib/kustomize/v010-adapter/base/kustomization.yaml new file mode 100644 index 00000000..97cbc27e --- /dev/null +++ b/contrib/kustomize/v010-adapter/base/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - daemonset.yaml +images: + - name: plugin + newName: ghcr.io/containerd/nri/plugins/v010-adapter +labels: + - includeSelectors: true + pairs: + app.kubernetes.io/name: nri-plugin-v010-adapter diff --git a/contrib/kustomize/v010-adapter/kustomization.yaml b/contrib/kustomize/v010-adapter/kustomization.yaml index d56ca05e..59fa03d6 100644 --- a/contrib/kustomize/v010-adapter/kustomization.yaml +++ b/contrib/kustomize/v010-adapter/kustomization.yaml @@ -1,13 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kube-system resources: - - daemonset.yaml -images: - - name: plugin - newName: ghcr.io/containerd/nri/plugins/v010-adapter - newTag: unstable -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/name: nri-plugin-v010-adapter + - base/ +components: + - ../components/image-stable diff --git a/contrib/kustomize/v010-adapter/unstable/kustomization.yaml b/contrib/kustomize/v010-adapter/unstable/kustomization.yaml new file mode 100644 index 00000000..a087a396 --- /dev/null +++ b/contrib/kustomize/v010-adapter/unstable/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/ +components: + - ../../components/image-unstable