From fb673db24399d0190ae2aaa52cf7f4f38da8250e Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Tue, 5 Jan 2021 10:44:31 -0300 Subject: [PATCH] Remove recycler pod templates. The template is no longer necessary in MCO because now it's embedded in KCM operator [0]. [0] https://github.com/openshift/cluster-kube-controller-manager-operator/pull/488 --- .../00-master/_base/files/recycler_pod.yaml | 31 ------------------- .../_base/files/recycler_pod_bad.yaml | 31 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 templates/master/00-master/_base/files/recycler_pod.yaml delete mode 100644 templates/master/00-master/_base/files/recycler_pod_bad.yaml diff --git a/templates/master/00-master/_base/files/recycler_pod.yaml b/templates/master/00-master/_base/files/recycler_pod.yaml deleted file mode 100644 index 96fd8624ec..0000000000 --- a/templates/master/00-master/_base/files/recycler_pod.yaml +++ /dev/null @@ -1,31 +0,0 @@ -mode: 0644 -path: "/etc/kubernetes/recycler-pod.yaml" -contents: - inline: | - apiVersion: v1 - kind: Pod - metadata: - name: recycler-pod - namespace: openshift-infra - spec: - activeDeadlineSeconds: 60 - restartPolicy: Never - serviceAccountName: pv-recycler-controller - containers: - - - name: recycler-container - image: "{{.Images.infraImageKey}}" - command: - - "/bin/bash" - args: - - "-c" - - "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1" - volumeMounts: - - - mountPath: /scrub - name: vol - securityContext: - runAsUser: 0 - volumes: - - - name: vol diff --git a/templates/master/00-master/_base/files/recycler_pod_bad.yaml b/templates/master/00-master/_base/files/recycler_pod_bad.yaml deleted file mode 100644 index c1a79ae46f..0000000000 --- a/templates/master/00-master/_base/files/recycler_pod_bad.yaml +++ /dev/null @@ -1,31 +0,0 @@ -mode: 0644 -path: "/etc/kubernetes/manifests/recycler-pod.yaml" -contents: - inline: | - apiVersion: v1 - kind: Pod - metadata: - name: recycler-pod - namespace: openshift-infra - spec: - activeDeadlineSeconds: 60 - restartPolicy: Never - serviceAccountName: pv-recycler-controller - containers: - - - name: recycler-container - image: "{{.Images.infraImageKey}}" - command: - - "/bin/bash" - args: - - "-c" - - "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1" - volumeMounts: - - - mountPath: /scrub - name: vol - securityContext: - runAsUser: 0 - volumes: - - - name: vol