Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kustomize fixes: Namespace cannot be created when using namespace transformer #536

Merged
merged 3 commits into from
Oct 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
7 changes: 1 addition & 6 deletions deployment/eks/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ kind: Namespace
metadata:
name: flyte
---
apiVersion: v1
kind: Namespace
metadata:
name: sparkoperator
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 1 addition & 6 deletions deployment/gcp/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ kind: Namespace
metadata:
name: flyte
---
apiVersion: v1
kind: Namespace
metadata:
name: sparkoperator
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 1 addition & 11 deletions deployment/sandbox/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions deployment/test/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion kustomize/base/single_cluster/headless/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: Kustomization
# All the resources that make up the deployment
resources:
# global resources
- ../../namespace
- ../../ingress
- ../../admindeployment
- ../../datacatalog
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resources:
- namespace.yaml
- rbac.yaml
- custom-config.yaml
- service.yaml
Expand Down