Skip to content

Commit c6a6587

Browse files
committed
fix: adapt openmcp operator deployment
1 parent 08355f8 commit c6a6587

File tree

5 files changed

+125
-8
lines changed

5 files changed

+125
-8
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# please fill this out
1+
{{ toYaml .Values.openmcpOperator.config }}

templates/openmcp/templates/resources/deployment.yaml

Lines changed: 63 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,45 @@ spec:
1616
labels:
1717
app: openmcp-operator
1818
spec:
19+
serviceAccount: openmcp-operator
1920
initContainers:
20-
- name: openmcp-init
21+
- name: openmcp-operator-init
2122
image: <openmcp/openmcp-operator>:latest
2223
args:
2324
- init
24-
- --environment=default
25+
- --environment={{ .Values.openmcpOperator.environment }}
2526
- --config=/etc/secret/openmcp-operator-config/config
27+
- --provider-name=managedcontrolplane
28+
env:
29+
- name: POD_NAME
30+
valueFrom:
31+
fieldRef:
32+
apiVersion: v1
33+
fieldPath: metadata.name
34+
- name: POD_NAMESPACE
35+
valueFrom:
36+
fieldRef:
37+
apiVersion: v1
38+
fieldPath: metadata.namespace
39+
- name: POD_IP
40+
valueFrom:
41+
fieldRef:
42+
apiVersion: v1
43+
fieldPath: status.podIP
44+
- name: POD_SERVICE_ACCOUNT_NAME
45+
valueFrom:
46+
fieldRef:
47+
apiVersion: v1
48+
fieldPath: spec.serviceAccountName
49+
resources:
50+
requests:
51+
cpu: 100m
52+
memory: 128Mi
53+
limits:
54+
cpu: 1000m
55+
memory: 1024Mi
56+
terminationMessagePath: /dev/termination-log
57+
terminationMessagePolicy: File
2658
volumeMounts:
2759
- mountPath: /etc/secret/openmcp-operator-config
2860
name: openmcp-operator-config
@@ -32,19 +64,43 @@ spec:
3264
image: <openmcp/openmcp-operator>:latest
3365
args:
3466
- run
35-
- --environment=default
67+
- --environment={{ .Values.openmcpOperator.environment }}
3668
- --config=/etc/secret/openmcp-operator-config/config
37-
volumeMounts:
38-
- mountPath: /etc/secret/openmcp-operator-config
39-
name: openmcp-operator-config
40-
readOnly: true
69+
- --provider-name=managedcontrolplane
70+
env:
71+
- name: POD_NAME
72+
valueFrom:
73+
fieldRef:
74+
apiVersion: v1
75+
fieldPath: metadata.name
76+
- name: POD_NAMESPACE
77+
valueFrom:
78+
fieldRef:
79+
apiVersion: v1
80+
fieldPath: metadata.namespace
81+
- name: POD_IP
82+
valueFrom:
83+
fieldRef:
84+
apiVersion: v1
85+
fieldPath: status.podIP
86+
- name: POD_SERVICE_ACCOUNT_NAME
87+
valueFrom:
88+
fieldRef:
89+
apiVersion: v1
90+
fieldPath: spec.serviceAccountName
4191
resources:
4292
requests:
4393
cpu: 100m
4494
memory: 128Mi
4595
limits:
4696
cpu: 1000m
4797
memory: 1024Mi
98+
terminationMessagePath: /dev/termination-log
99+
terminationMessagePolicy: File
100+
volumeMounts:
101+
- mountPath: /etc/secret/openmcp-operator-config
102+
name: openmcp-operator-config
103+
readOnly: true
48104
volumes:
49105
- name: openmcp-operator-config
50106
secret:

templates/openmcp/templates/resources/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
resources:
5+
- rbac.yaml
56
- namespace.yaml
67
- deployment.yaml
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: openmcp-operator
5+
namespace: openmcp-system
6+
---
7+
apiVersion: rbac.authorization.k8s.io/v1
8+
kind: ClusterRoleBinding
9+
metadata:
10+
name: openmcp-system:openmcp-operator
11+
roleRef:
12+
apiGroup: rbac.authorization.k8s.io
13+
kind: ClusterRole
14+
name: cluster-admin
15+
subjects:
16+
- kind: ServiceAccount
17+
name: openmcp-operator
18+
namespace: openmcp-system

templates/openmcp/values.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,45 @@
22
openmcpOperator:
33
image: ghcr.io/openmcp-project/images/openmcp-operator
44
tag: v0.9.1
5+
environment: dev
6+
config:
7+
managedControlPlane:
8+
mcpClusterPurpose: mcp-worker
9+
reconcileMCPEveryXDays: 7
10+
scheduler:
11+
scope: Cluster
12+
purposeMappings:
13+
mcp:
14+
template:
15+
spec:
16+
profile: env.cpname.mcpds-workerless
17+
tenancy: Exclusive
18+
mcp-worker:
19+
template:
20+
spec:
21+
profile: env.cpname.mcpds-small
22+
tenancy: Exclusive
23+
platform:
24+
template:
25+
metadata:
26+
labels:
27+
clusters.openmcp.cloud/delete-without-requests: "false"
28+
spec:
29+
profile: env.cpname.mcpd-large
30+
tenancy: Shared
31+
onboarding:
32+
template:
33+
metadata:
34+
labels:
35+
clusters.openmcp.cloud/delete-without-requests: "false"
36+
spec:
37+
profile: env.cpname.mcpd-workerless
38+
tenancy: Shared
39+
workload:
40+
tenancyCount: 20
41+
template:
42+
metadata:
43+
namespace: workload-clusters
44+
spec:
45+
profile: env.cpname.mcpd-small
46+
tenancy: Shared

0 commit comments

Comments
 (0)