From 296bf3cc6c6b4475b9a834910ad274c08468d3d0 Mon Sep 17 00:00:00 2001
From: leigh capili <leigh@null.net>
Date: Tue, 1 Jun 2021 13:38:18 -0600
Subject: [PATCH] Fix eventhub integration config patches
Signed-off-by: leigh capili <leigh@null.net>
---
.../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 72503148..c4a8a062 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 62ea86f0..409db4fd 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 72503148..c4a8a062 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 e7fd16a7..56d47856 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 b2374ac0..5eb1d262 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
--
GitLab