Kustomize fixes: Namespace cannot be created when using namespace tra…

…nsformer (#536)
flyteorg · Oct 6, 2020 · 1733672 · 1733672
1 parent d28a67b
commit 1733672
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: kustomize
 kustomize:
-	KUSTOMIZE_VERSION=3.8.2 bash script/generate_kustomize.sh
+	KUSTOMIZE_VERSION=3.8.4 bash script/generate_kustomize.sh
 
 .PHONY: deploy_sandbox
 deploy_sandbox:

diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -3,11 +3,6 @@ kind: Namespace
 metadata:
   name: flyte
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: sparkoperator
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -1411,7 +1406,7 @@ spec:
             - /etc/flyte/config/*.yaml
             - clusterresource
             - sync
-            image: flyteadmin:v0.3.5
+            image: docker.io/lyft/flyteadmin:v0.3.6
             imagePullPolicy: IfNotPresent
             name: sync-cluster-resources
             volumeMounts:

diff --git a/deployment/gcp/flyte_generated.yaml b/deployment/gcp/flyte_generated.yaml
@@ -3,11 +3,6 @@ kind: Namespace
 metadata:
   name: flyte
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: sparkoperator
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -1479,7 +1474,7 @@ spec:
             - /etc/flyte/config/*.yaml
             - clusterresource
             - sync
-            image: flyteadmin:v0.3.5
+            image: docker.io/lyft/flyteadmin:v0.3.6
             imagePullPolicy: IfNotPresent
             name: sync-cluster-resources
             volumeMounts:

diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
@@ -3,16 +3,6 @@ kind: Namespace
 metadata:
   name: flyte
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: heptio-contour
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: sparkoperator
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -1768,7 +1758,7 @@ spec:
             - /etc/flyte/config/*.yaml
             - clusterresource
             - sync
-            image: flyteadmin:v0.3.5
+            image: docker.io/lyft/flyteadmin:v0.3.6
             imagePullPolicy: IfNotPresent
             name: sync-cluster-resources
             volumeMounts:

diff --git a/deployment/test/flyte_generated.yaml b/deployment/test/flyte_generated.yaml
@@ -3,11 +3,6 @@ kind: Namespace
 metadata:
   name: flyte
 ---
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: heptio-contour
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:

diff --git a/kustomize/base/single_cluster/headless/kustomization.yaml b/kustomize/base/single_cluster/headless/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 # All the resources that make up the deployment
 resources:
 # global resources
-- ../../namespace
 - ../../ingress
 - ../../admindeployment
 - ../../datacatalog

diff --git a/kustomize/overlays/sandbox/dependencies/contour_ingress_controller/kustomization.yaml b/kustomize/overlays/sandbox/dependencies/contour_ingress_controller/kustomization.yaml
@@ -1,5 +1,4 @@
 resources:
-- namespace.yaml
 - rbac.yaml
 - custom-config.yaml
 - service.yaml