From efa1621b055ffa415b4c7042ce3078d6d843ed1d Mon Sep 17 00:00:00 2001 From: leigh capili Date: Tue, 1 Jun 2021 13:38:18 -0600 Subject: [PATCH] Fix eventhub integration config patches Signed-off-by: leigh capili --- .../eventhub-credentials-sync/_base/kustomization.yaml | 7 ------- .../integrations/eventhub-credentials-sync/_base/sync.yaml | 6 +++--- .../_cronjobs/_base/kustomization.yaml | 7 ------- .../eventhub-credentials-sync/_cronjobs/_base/sync.yaml | 6 +++--- .../_cronjobs/generic/config-patches.yaml | 1 - 5 files changed, 6 insertions(+), 21 deletions(-) diff --git a/manifests/integrations/eventhub-credentials-sync/_base/kustomization.yaml b/manifests/integrations/eventhub-credentials-sync/_base/kustomization.yaml index 7250314869..c4a8a062e7 100644 --- a/manifests/integrations/eventhub-credentials-sync/_base/kustomization.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_base/kustomization.yaml @@ -18,13 +18,6 @@ vars: apiVersion: v1 fieldref: fieldpath: data.KUBE_SECRET - - name: ADDRESS - objref: - kind: ConfigMap - name: credentials-sync-eventhub - apiVersion: v1 - fieldref: - fieldpath: data.ADDRESS configurations: - kustomizeconfig.yaml diff --git a/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml b/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml index 62ea86f0d9..409db4fdf2 100644 --- a/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_base/sync.yaml @@ -109,9 +109,9 @@ rules: - create - update - patch - # # Lock this down to the specific Secret name (Optional) - #resourceNames: - # - $(KUBE_SECRET) # templated from kustomize vars referencing ConfigMap, also see kustomizeconfig.yaml + # Lock this down to the specific Secret name (Optional) + resourceNames: + - $(KUBE_SECRET) # templated from kustomize vars referencing ConfigMap, also see kustomizeconfig.yaml --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/kustomization.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/kustomization.yaml index 7250314869..c4a8a062e7 100644 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/kustomization.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/kustomization.yaml @@ -18,13 +18,6 @@ vars: apiVersion: v1 fieldref: fieldpath: data.KUBE_SECRET - - name: ADDRESS - objref: - kind: ConfigMap - name: credentials-sync-eventhub - apiVersion: v1 - fieldref: - fieldpath: data.ADDRESS configurations: - kustomizeconfig.yaml diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml index e7fd16a71a..56d47856fc 100644 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml @@ -85,9 +85,9 @@ rules: - create - update - patch - # # Lock this down to the specific Secret name (Optional) - #resourceNames: - # - $(KUBE_SECRET) # templated from kustomize vars referencing ConfigMap, also see kustomizeconfig.yaml + # Lock this down to the specific Secret name (Optional) + resourceNames: + - $(KUBE_SECRET) # templated from kustomize vars referencing ConfigMap, also see kustomizeconfig.yaml --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 diff --git a/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/config-patches.yaml b/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/config-patches.yaml index b2374ac04c..5eb1d2629d 100644 --- a/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/config-patches.yaml +++ b/manifests/integrations/eventhub-credentials-sync/_cronjobs/generic/config-patches.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: credentials-sync-eventhub - namespace: flux-system data: KUBE_SECRET: webhook-url # does not yet exist -- will be created in the same Namespace ADDRESS: "fluxv2" # the Azure Event Hub name