Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ images:
newTag: latest

resources:
- namespace.yaml
- manager.yaml
- ../crds
- ../rbac
Expand Down
5 changes: 0 additions & 5 deletions webhosting-operator/config/manager/default/manager.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
apiVersion: v1
kind: Namespace
metadata:
name: system
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
4 changes: 4 additions & 0 deletions webhosting-operator/config/manager/default/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: system
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ generatorOptions:
disableNameSuffixHash: true

configMapGenerator:
- files:
- controller_manager_config.yaml
name: manager-config
- name: webhosting-operator
namespace: webhosting-system
files:
- config.yaml

patches:
- path: manager_patch.yaml
16 changes: 8 additions & 8 deletions webhosting-operator/config/manager/with-dns/manager_patch.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: operator
namespace: system
name: webhosting-operator
namespace: webhosting-system
spec:
template:
spec:
containers:
- name: manager
args:
- --config=/controller_manager_config.yaml
- --config=/config.yaml
volumeMounts:
- name: manager-config
mountPath: /controller_manager_config.yaml
subPath: controller_manager_config.yaml
- name: config
mountPath: /config.yaml
subPath: config.yaml
volumes:
- name: manager-config
- name: config
configMap:
name: manager-config
name: webhosting-operator