Skip to content

Commit

Permalink
fix e2e test
Browse files Browse the repository at this point in the history
Signed-off-by: UMEZAWA Takeshi <takeshi-umezawa@cybozu.co.jp>
  • Loading branch information
umezawatakeshi committed Nov 2, 2020
1 parent e7e8510 commit 56818ee
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 59 deletions.
10 changes: 5 additions & 5 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: controller-manager
name: moco-controller-manager
namespace: system
labels:
control-plane: controller-manager
control-plane: moco-controller-manager
annotations:
prometheus.io/port: "8080"
spec:
selector:
matchLabels:
control-plane: controller-manager
control-plane: moco-controller-manager
replicas: 1
template:
metadata:
labels:
control-plane: controller-manager
control-plane: moco-controller-manager
spec:
containers:
- name: manager
command:
- /manager
- /moco-controller
image: controller:latest
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion config/namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
control-plane: controller-manager
control-plane: moco-controller-manager
name: moco-system
7 changes: 0 additions & 7 deletions config/rbac/auth_proxy_client_clusterrole.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions config/rbac/auth_proxy_role.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions config/rbac/auth_proxy_role_binding.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions config/rbac/auth_proxy_service.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,3 @@ resources:
- role_binding.yaml
- leader_election_role.yaml
- leader_election_role_binding.yaml
# Comment the following 4 lines if you want to disable
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
# which protects your /metrics endpoint.
- auth_proxy_service.yaml
- auth_proxy_role.yaml
- auth_proxy_role_binding.yaml
- auth_proxy_client_clusterrole.yaml
2 changes: 2 additions & 0 deletions e2e/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ bases:
images:
- name: controller
newTag: dev
patchesStrategicMerge:
- moco_controller.yaml
11 changes: 11 additions & 0 deletions e2e/manifests/moco_controller.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: moco-controller-manager
namespace: moco-system
spec:
template:
spec:
containers:
- name: manager
imagePullPolicy: Never

0 comments on commit 56818ee

Please sign in to comment.