Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
wxpjimmy committed Apr 29, 2020
1 parent a7731d1 commit 1702482
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 20 deletions.
4 changes: 2 additions & 2 deletions jupyter/notebook-controller/base/cluster-role-binding.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: role-binding-$(namespace)
name: role-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: role
subjects:
- kind: ServiceAccount
name: service-account
name: service-account
7 changes: 0 additions & 7 deletions jupyter/notebook-controller/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,5 @@ vars:
apiVersion: v1
kind: ConfigMap
name: parameters
- fieldref:
fieldPath: metadata.namespace
name: namespace
objref:
apiVersion: v1
kind: Service
name: service
configurations:
- params.yaml
3 changes: 0 additions & 3 deletions jupyter/notebook-controller/base/params.yaml

This file was deleted.

11 changes: 7 additions & 4 deletions kfam-route/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- virtual-service.yaml

configMapGenerator:
- env: params.env
name: parameters

vars:
- fieldref:
fieldPath: metadata.namespace
fieldPath: data.namespace
name: namespace
objref:
apiVersion: v1
kind: VirtualService
name: kfam
kind: ConfigMap
name: parameters

configurations:
- params.yaml
1 change: 1 addition & 0 deletions kfam-route/base/params.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
namespace=
2 changes: 1 addition & 1 deletion profiles/base/cluster-role-binding.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: cluster-role-binding-$(namespace)
name: cluster-role-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
4 changes: 1 addition & 3 deletions profiles/base/params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ varReference:
- path: spec/template/spec/containers/1/args/3
kind: Deployment
- path: spec/template/spec/containers/1/args/5
kind: Deployment
- path: metadata/name
kind: ClusterRoleBinding
kind: Deployment

0 comments on commit 1702482

Please sign in to comment.