From f18c5cc1ffa72d3f325b64d74e9c211a000734e9 Mon Sep 17 00:00:00 2001 From: Phil Prasek Date: Fri, 5 Nov 2021 15:57:41 -0700 Subject: [PATCH] flux now requires namespace to be set Signed-off-by: Phil Prasek --- .scripts/k8s-up-flux.sh | 3 --- router/base/kustomization.yaml | 1 + router/base/router.yaml | 3 +++ router/dev/kustomization.yaml | 1 + router/prod/kustomization.yaml | 1 + router/stage/kustomization.yaml | 1 + subgraphs/base/subgraphs.yaml | 6 ++++++ 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.scripts/k8s-up-flux.sh b/.scripts/k8s-up-flux.sh index d947638..aa9a7f2 100755 --- a/.scripts/k8s-up-flux.sh +++ b/.scripts/k8s-up-flux.sh @@ -16,7 +16,6 @@ flux create kustomization infra \ --path="./infra/${INFRA_ENV}" \ --prune=true \ --interval=1m \ - --validation=client flux create kustomization subgraphs \ --namespace=default \ @@ -24,7 +23,6 @@ flux create kustomization subgraphs \ --path="./subgraphs/${SUBGRAPHS_ENV}" \ --prune=true \ --interval=1m \ - --validation=client flux create kustomization router \ --depends-on=infra \ @@ -33,7 +31,6 @@ flux create kustomization router \ --path="./router/${ROUTER_ENV}" \ --prune=true \ --interval=1m \ - --validation=client kubectl wait --namespace ingress-nginx \ --for=condition=ready pod \ diff --git a/router/base/kustomization.yaml b/router/base/kustomization.yaml index 7bb8378..2b982f1 100644 --- a/router/base/kustomization.yaml +++ b/router/base/kustomization.yaml @@ -4,3 +4,4 @@ resources: - router.yaml configMapGenerator: - name: supergraph + namespace: default diff --git a/router/base/router.yaml b/router/base/router.yaml index e3eee08..f81f9c4 100644 --- a/router/base/router.yaml +++ b/router/base/router.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: router-deployment + namespace: default labels: app: router spec: @@ -34,6 +35,7 @@ apiVersion: v1 kind: Service metadata: name: router-service + namespace: default spec: selector: app: router @@ -46,6 +48,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: router-ingress + namespace: default annotations: kubernetes.io/ingress.class: nginx spec: diff --git a/router/dev/kustomization.yaml b/router/dev/kustomization.yaml index d26da25..0b8093a 100644 --- a/router/dev/kustomization.yaml +++ b/router/dev/kustomization.yaml @@ -5,6 +5,7 @@ configMapGenerator: files: - ./supergraph.graphql name: supergraph + namespace: default resources: - ../base images: diff --git a/router/prod/kustomization.yaml b/router/prod/kustomization.yaml index 1df0d65..4acc584 100644 --- a/router/prod/kustomization.yaml +++ b/router/prod/kustomization.yaml @@ -5,6 +5,7 @@ configMapGenerator: files: - ./supergraph.graphql name: supergraph + namespace: default resources: - ../base images: diff --git a/router/stage/kustomization.yaml b/router/stage/kustomization.yaml index 1df0d65..4acc584 100644 --- a/router/stage/kustomization.yaml +++ b/router/stage/kustomization.yaml @@ -5,6 +5,7 @@ configMapGenerator: files: - ./supergraph.graphql name: supergraph + namespace: default resources: - ../base images: diff --git a/subgraphs/base/subgraphs.yaml b/subgraphs/base/subgraphs.yaml index eb199f2..c4fb1d8 100644 --- a/subgraphs/base/subgraphs.yaml +++ b/subgraphs/base/subgraphs.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: products + namespace: default labels: app: subgraph-products spec: @@ -24,6 +25,7 @@ apiVersion: v1 kind: Service metadata: name: products + namespace: default spec: selector: app: subgraph-products @@ -36,6 +38,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: users + namespace: default labels: app: subgraph-users spec: @@ -58,6 +61,7 @@ apiVersion: v1 kind: Service metadata: name: users + namespace: default spec: selector: app: subgraph-users @@ -70,6 +74,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: inventory + namespace: default labels: app: subgraph-inventory spec: @@ -92,6 +97,7 @@ apiVersion: v1 kind: Service metadata: name: inventory + namespace: default spec: selector: app: subgraph-inventory