From bb0114e379b887267a9c36b5406bfd3429339e89 Mon Sep 17 00:00:00 2001 From: leigh capili Date: Tue, 1 Jun 2021 10:22:46 -0600 Subject: [PATCH] Remove per-cloud /kbin/kubectl patches Signed-off-by: leigh capili --- .../_cronjobs/azure/kubectl-patch.yaml | 34 ------------------- .../_cronjobs/azure/kustomization.yaml | 1 - .../_cronjobs/generic/kubectl-patch.yaml | 34 ------------------- .../_cronjobs/generic/kustomization.yaml | 1 - .../azure/kubectl-patch.yaml | 32 ----------------- .../azure/kustomization.yaml | 1 - .../generic/kubectl-patch.yaml | 32 ----------------- .../generic/kustomization.yaml | 1 - .../_cronjobs/aws/kubectl-patch.yaml | 30 ---------------- .../_cronjobs/aws/kustomization.yaml | 1 - .../_cronjobs/azure/kubectl-patch.yaml | 30 ---------------- .../_cronjobs/azure/kustomization.yaml | 1 - .../aws/kubectl-patch.yaml | 28 --------------- .../aws/kustomization.yaml | 1 - .../azure/kubectl-patch.yaml | 28 --------------- .../azure/kustomization.yaml | 1 - 16 files changed, 256 deletions(-) delete mode 100644 manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kubectl-patch.yaml delete mode 100644 manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kubectl-patch.yaml delete mode 100644 manifests/integrations/eventhub-credentials-sync/azure/kubectl-patch.yaml delete mode 100644 manifests/integrations/eventhub-credentials-sync/generic/kubectl-patch.yaml delete mode 100644 manifests/integrations/registry-credentials-sync/_cronjobs/aws/kubectl-patch.yaml delete mode 100644 manifests/integrations/registry-credentials-sync/_cronjobs/azure/kubectl-patch.yaml delete mode 100644 manifests/integrations/registry-credentials-sync/aws/kubectl-patch.yaml delete mode 100644 manifests/integrations/registry-credentials-sync/azure/kubectl-patch.yaml diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kubectl-patch.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kubectl-patch.yaml deleted file mode 100644 index d05c07e5..00000000 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kubectl-patch.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: batch/v1beta1 -kind: CronJob -metadata: - name: credentials-sync-eventhub - namespace: flux-system -spec: - jobTemplate: - spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - securityContext: - privileged: false - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kustomization.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kustomization.yaml index 14a0d59f..f5ca8d55 100644 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kustomization.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/azure/kustomization.yaml @@ -14,7 +14,6 @@ resources: patchesStrategicMerge: - config-patches.yaml - - kubectl-patch.yaml - reconcile-patch.yaml vars: diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kubectl-patch.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kubectl-patch.yaml deleted file mode 100644 index d05c07e5..00000000 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kubectl-patch.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: batch/v1beta1 -kind: CronJob -metadata: - name: credentials-sync-eventhub - namespace: flux-system -spec: - jobTemplate: - spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - securityContext: - privileged: false - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kustomization.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kustomization.yaml index 109f3a07..a8e853e6 100644 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kustomization.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/kustomization.yaml @@ -14,7 +14,6 @@ resources: patchesStrategicMerge: - config-patches.yaml - - kubectl-patch.yaml - reconcile-patch.yaml configurations: diff --git a/manifests/integrations/eventhub-credentials-sync/azure/kubectl-patch.yaml b/manifests/integrations/eventhub-credentials-sync/azure/kubectl-patch.yaml deleted file mode 100644 index 65226a0f..00000000 --- a/manifests/integrations/eventhub-credentials-sync/azure/kubectl-patch.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: credentials-sync-eventhub - namespace: flux-system -spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - securityContext: - privileged: false - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/eventhub-credentials-sync/azure/kustomization.yaml b/manifests/integrations/eventhub-credentials-sync/azure/kustomization.yaml index 14a0d59f..f5ca8d55 100644 --- a/manifests/integrations/eventhub-credentials-sync/azure/kustomization.yaml +++ b/manifests/integrations/eventhub-credentials-sync/azure/kustomization.yaml @@ -14,7 +14,6 @@ resources: patchesStrategicMerge: - config-patches.yaml - - kubectl-patch.yaml - reconcile-patch.yaml vars: diff --git a/manifests/integrations/eventhub-credentials-sync/generic/kubectl-patch.yaml b/manifests/integrations/eventhub-credentials-sync/generic/kubectl-patch.yaml deleted file mode 100644 index 65226a0f..00000000 --- a/manifests/integrations/eventhub-credentials-sync/generic/kubectl-patch.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: credentials-sync-eventhub - namespace: flux-system -spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - securityContext: - privileged: false - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/eventhub-credentials-sync/generic/kustomization.yaml b/manifests/integrations/eventhub-credentials-sync/generic/kustomization.yaml index 109f3a07..a8e853e6 100644 --- a/manifests/integrations/eventhub-credentials-sync/generic/kustomization.yaml +++ b/manifests/integrations/eventhub-credentials-sync/generic/kustomization.yaml @@ -14,7 +14,6 @@ resources: patchesStrategicMerge: - config-patches.yaml - - kubectl-patch.yaml - reconcile-patch.yaml configurations: diff --git a/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kubectl-patch.yaml b/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kubectl-patch.yaml deleted file mode 100644 index b4d83e22..00000000 --- a/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kubectl-patch.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: batch/v1beta1 -kind: CronJob -metadata: - name: credentials-sync - namespace: flux-system -spec: - jobTemplate: - spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kustomization.yaml b/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kustomization.yaml index 11eea1b4..6e58e58b 100644 --- a/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kustomization.yaml +++ b/manifests/integrations/registry-credentials-sync/_cronjobs/aws/kustomization.yaml @@ -14,7 +14,6 @@ bases: patchesStrategicMerge: - config-patches.yaml -- kubectl-patch.yaml - reconcile-patch.yaml ## uncomment if using encrypted-secret.yaml diff --git a/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kubectl-patch.yaml b/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kubectl-patch.yaml deleted file mode 100644 index b4d83e22..00000000 --- a/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kubectl-patch.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: batch/v1beta1 -kind: CronJob -metadata: - name: credentials-sync - namespace: flux-system -spec: - jobTemplate: - spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kustomization.yaml b/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kustomization.yaml index 1dd497e0..54c333a9 100644 --- a/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kustomization.yaml +++ b/manifests/integrations/registry-credentials-sync/_cronjobs/azure/kustomization.yaml @@ -14,7 +14,6 @@ resources: patchesStrategicMerge: - config-patches.yaml -- kubectl-patch.yaml - reconcile-patch.yaml vars: diff --git a/manifests/integrations/registry-credentials-sync/aws/kubectl-patch.yaml b/manifests/integrations/registry-credentials-sync/aws/kubectl-patch.yaml deleted file mode 100644 index b054d7ce..00000000 --- a/manifests/integrations/registry-credentials-sync/aws/kubectl-patch.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: credentials-sync - namespace: flux-system -spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/registry-credentials-sync/aws/kustomization.yaml b/manifests/integrations/registry-credentials-sync/aws/kustomization.yaml index 11eea1b4..6e58e58b 100644 --- a/manifests/integrations/registry-credentials-sync/aws/kustomization.yaml +++ b/manifests/integrations/registry-credentials-sync/aws/kustomization.yaml @@ -14,7 +14,6 @@ bases: patchesStrategicMerge: - config-patches.yaml -- kubectl-patch.yaml - reconcile-patch.yaml ## uncomment if using encrypted-secret.yaml diff --git a/manifests/integrations/registry-credentials-sync/azure/kubectl-patch.yaml b/manifests/integrations/registry-credentials-sync/azure/kubectl-patch.yaml deleted file mode 100644 index b054d7ce..00000000 --- a/manifests/integrations/registry-credentials-sync/azure/kubectl-patch.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: credentials-sync - namespace: flux-system -spec: - template: - spec: - initContainers: - - image: bitnami/kubectl - name: copy-kubectl - # it's okay to do this because kubectl is a statically linked binary - command: - - sh - - -ceu - - cp $(which kubectl) /kbin/ - resources: {} - volumeMounts: - - name: kbin - mountPath: /kbin - containers: - - name: sync - volumeMounts: - - name: kbin - mountPath: /kbin - volumes: - - name: kbin - emptyDir: {} diff --git a/manifests/integrations/registry-credentials-sync/azure/kustomization.yaml b/manifests/integrations/registry-credentials-sync/azure/kustomization.yaml index 1dd497e0..54c333a9 100644 --- a/manifests/integrations/registry-credentials-sync/azure/kustomization.yaml +++ b/manifests/integrations/registry-credentials-sync/azure/kustomization.yaml @@ -14,7 +14,6 @@ resources: patchesStrategicMerge: - config-patches.yaml -- kubectl-patch.yaml - reconcile-patch.yaml vars: