From ffa421d6f2694d267bcdc44dc16dba8542399bf9 Mon Sep 17 00:00:00 2001 From: Sebastian Eriksson Date: Mon, 20 Jan 2025 14:50:14 +0100 Subject: [PATCH] two namespaces --- external/external-controller.yaml | 3 +-- external/kustomization.yaml | 3 +++ namespace.yaml => external/namespace.yaml | 2 +- internal/internal-controller.yaml | 3 +-- internal/kustomization.yaml | 3 +++ internal/namespace.yaml | 6 ++++++ kustomization.yaml | 1 - 7 files changed, 15 insertions(+), 6 deletions(-) rename namespace.yaml => external/namespace.yaml (78%) create mode 100644 internal/namespace.yaml diff --git a/external/external-controller.yaml b/external/external-controller.yaml index 6efcc90..46f03c2 100644 --- a/external/external-controller.yaml +++ b/external/external-controller.yaml @@ -21,9 +21,8 @@ spec: - /nginx-ingress-controller - --ingress-class=nginx-external - --configmap=$(POD_NAMESPACE)/nginx-configuration + - --publish-status-address=192.168.0.190 - --update-status - - --update-status-on-shutdown - - --report-node-internal-ip-address env: - name: POD_NAME valueFrom: diff --git a/external/kustomization.yaml b/external/kustomization.yaml index f428053..79edf11 100644 --- a/external/kustomization.yaml +++ b/external/kustomization.yaml @@ -1,8 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: external-ingress + resources: # - proxy - external-controller.yaml - external-policy.yaml - service.yaml + - namespace.yaml diff --git a/namespace.yaml b/external/namespace.yaml similarity index 78% rename from namespace.yaml rename to external/namespace.yaml index cc9df41..e081bae 100644 --- a/namespace.yaml +++ b/external/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: ingress-nginx + name: external-ingress annotations: argocd.argoproj.io/sync-wave: "0" diff --git a/internal/internal-controller.yaml b/internal/internal-controller.yaml index 5b397ab..87104a1 100644 --- a/internal/internal-controller.yaml +++ b/internal/internal-controller.yaml @@ -21,9 +21,8 @@ spec: - /nginx-ingress-controller - --ingress-class=nginx-internal - --configmap=$(POD_NAMESPACE)/nginx-configuration + - --publish-status-address=192.168.0.190 - --update-status - - --update-status-on-shutdown - - --report-node-internal-ip-address env: - name: POD_NAME valueFrom: diff --git a/internal/kustomization.yaml b/internal/kustomization.yaml index a02a384..2e73987 100644 --- a/internal/kustomization.yaml +++ b/internal/kustomization.yaml @@ -1,8 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: internal-ingress + resources: # - proxy - internal-controller.yaml - internal-policy.yaml - service.yaml + - namespace.yaml diff --git a/internal/namespace.yaml b/internal/namespace.yaml new file mode 100644 index 0000000..074794c --- /dev/null +++ b/internal/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: internal-ingress + annotations: + argocd.argoproj.io/sync-wave: "0" diff --git a/kustomization.yaml b/kustomization.yaml index d29d870..4864e3e 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -4,7 +4,6 @@ kind: Kustomization namespace: ingress-nginx resources: - - namespace.yaml - internal - external