Skip to content

Commit 236fab4

Browse files
dprincedprince
committed
Customize new kustomization.yaml's
Also run bindata
1 parent 6352fbd commit 236fab4

53 files changed

Lines changed: 1642 additions & 635 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ endif
380380
bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
381381
$(OPERATOR_SDK) generate kustomize manifests -q
382382
cd config/operator/deployment/ && $(KUSTOMIZE) edit set image controller=$(IMG) && \
383-
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/1/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]" && \
384-
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/1/env/1\", \"value\": {\"name\": \"OPERATOR_IMAGE_URL\", \"value\": \"$(IMG)\"}}]"
383+
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]" && \
384+
$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/1\", \"value\": {\"name\": \"OPERATOR_IMAGE_URL\", \"value\": \"$(IMG)\"}}]"
385385
$(KUSTOMIZE) build config/operator --load-restrictor='LoadRestrictionsNone' | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
386386
$(OPERATOR_SDK) bundle validate ./bundle
387387

‎bindata/operator/infra-operator-webhooks.yaml‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/created-by: openstack-operator
77
app.kubernetes.io/instance: webhook-service
88
app.kubernetes.io/managed-by: kustomize
9-
app.kubernetes.io/name: service
9+
app.kubernetes.io/name: infra-operator
1010
app.kubernetes.io/part-of: infra-operator
1111
name: infra-operator-webhook-service
1212
namespace: '{{ .OperatorNamespace }}'
@@ -16,7 +16,8 @@ spec:
1616
protocol: TCP
1717
targetPort: 9443
1818
selector:
19-
openstack.org/operator-name: infra
19+
app.kubernetes.io/name: infra-operator
20+
control-plane: controller-manager
2021
---
2122
apiVersion: cert-manager.io/v1
2223
kind: Certificate
@@ -26,8 +27,7 @@ metadata:
2627
app.kubernetes.io/created-by: openstack-operator
2728
app.kubernetes.io/instance: serving-cert
2829
app.kubernetes.io/managed-by: kustomize
29-
app.kubernetes.io/name: certificate
30-
app.kubernetes.io/part-of: infra-operator
30+
app.kubernetes.io/name: infra-operator
3131
name: infra-operator-serving-cert
3232
namespace: '{{ .OperatorNamespace }}'
3333
spec:
@@ -39,21 +39,6 @@ spec:
3939
name: infra-operator-selfsigned-issuer
4040
secretName: infra-operator-webhook-server-cert
4141
---
42-
apiVersion: cert-manager.io/v1
43-
kind: Issuer
44-
metadata:
45-
labels:
46-
app.kubernetes.io/component: certificate
47-
app.kubernetes.io/created-by: openstack-operator
48-
app.kubernetes.io/instance: selfsigned-issuer
49-
app.kubernetes.io/managed-by: kustomize
50-
app.kubernetes.io/name: issuer
51-
app.kubernetes.io/part-of: infra-operator
52-
name: infra-operator-selfsigned-issuer
53-
namespace: '{{ .OperatorNamespace }}'
54-
spec:
55-
selfSigned: {}
56-
---
5742
apiVersion: admissionregistration.k8s.io/v1
5843
kind: MutatingWebhookConfiguration
5944
metadata:

‎bindata/operator/managers.yaml‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,35 @@ kind: Deployment
44
metadata:
55
labels:
66
control-plane: controller-manager
7-
openstack.org/operator-name: {{ .Name }}
7+
app.kubernetes.io/name: {{ .Name }}
88
name: {{ .Name }}-operator-controller-manager
99
namespace: {{ .Namespace }}
1010
spec:
1111
replicas: {{ .Deployment.Replicas }}
1212
selector:
1313
matchLabels:
14-
openstack.org/operator-name: {{ .Name }}
14+
app.kubernetes.io/name: {{ .Name }}
1515
template:
1616
metadata:
1717
annotations:
1818
kubectl.kubernetes.io/default-container: manager
1919
labels:
2020
control-plane: controller-manager
21-
openstack.org/operator-name: {{ .Name }}
21+
app.kubernetes.io/name: {{ .Name }}
2222
spec:
2323
containers:
2424
- args:
25+
- --leader-elect
2526
- --health-probe-bind-address=:8081
27+
{{- if isEnvVarTrue .Deployment.Manager.Env "METRICS_CERTS" }}
28+
- --metrics-bind-address=:8443
29+
- --metrics-cert-path=/tmp/k8s-metrics-server/metrics-certs
30+
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
31+
- --webhook-cert-path=/tmp/k8s-webhook-server/serving-certs
32+
{{- end }}
33+
{{- else }}
2634
- --metrics-bind-address=127.0.0.1:8080
27-
- --leader-elect
35+
{{- end }}
2836
command:
2937
- /manager
3038
env:
@@ -55,12 +63,18 @@ spec:
5563
memory: {{ .Deployment.Manager.Resources.Requests.Memory }}
5664
securityContext:
5765
allowPrivilegeEscalation: false
58-
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
5966
volumeMounts:
67+
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
6068
- mountPath: /tmp/k8s-webhook-server/serving-certs
6169
name: cert
6270
readOnly: true
6371
{{- end }}
72+
{{- if isEnvVarTrue .Deployment.Manager.Env "METRICS_CERTS" }}
73+
- mountPath: /tmp/k8s-metrics-server/metrics-certs
74+
name: metrics-certs
75+
readOnly: true
76+
{{- end }}
77+
{{- if isEnvVarFalse .Deployment.Manager.Env "METRICS_CERTS" }}
6478
- args:
6579
- --secure-listen-address=0.0.0.0:8443
6680
- --upstream=http://127.0.0.1:8080/
@@ -81,6 +95,7 @@ spec:
8195
memory: {{ .Deployment.KubeRbacProxy.Resources.Requests.Memory }}
8296
securityContext:
8397
allowPrivilegeEscalation: false
98+
{{- end }}
8499
securityContext:
85100
runAsNonRoot: true
86101
serviceAccountName: {{ .Name }}-operator-controller-manager
@@ -101,12 +116,25 @@ spec:
101116
tolerationSeconds: {{ .TolerationSeconds }}
102117
{{- end }}
103118
{{- end }}
104-
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
105119
volumes:
120+
{{- if isEnvVarTrue .Deployment.Manager.Env "ENABLE_WEBHOOKS" }}
106121
- name: cert
107122
secret:
108123
defaultMode: 420
109124
secretName: {{ .Name }}-operator-webhook-server-cert
110125
{{ end }}
126+
{{- if isEnvVarTrue .Deployment.Manager.Env "METRICS_CERTS" }}
127+
- name: metrics-certs
128+
secret:
129+
items:
130+
- key: ca.crt
131+
path: ca.crt
132+
- key: tls.crt
133+
path: tls.crt
134+
- key: tls.key
135+
path: tls.key
136+
optional: false
137+
secretName: {{ .Name }}-operator-metrics-server-cert
138+
{{ end }}
111139
---
112140
{{ end }}

‎bindata/operator/openstack-baremetal-operator-webhooks.yaml‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/created-by: openstack-operator
77
app.kubernetes.io/instance: webhook-service
88
app.kubernetes.io/managed-by: kustomize
9-
app.kubernetes.io/name: service
9+
app.kubernetes.io/name: openstack-baremetal-operator
1010
app.kubernetes.io/part-of: openstack-baremetal-operator
1111
name: openstack-baremetal-operator-webhook-service
1212
namespace: '{{ .OperatorNamespace }}'
@@ -16,7 +16,8 @@ spec:
1616
protocol: TCP
1717
targetPort: 9443
1818
selector:
19-
openstack.org/operator-name: openstack-baremetal
19+
app.kubernetes.io/name: openstack-baremetal-operator
20+
control-plane: controller-manager
2021
---
2122
apiVersion: cert-manager.io/v1
2223
kind: Certificate
@@ -26,8 +27,7 @@ metadata:
2627
app.kubernetes.io/created-by: openstack-operator
2728
app.kubernetes.io/instance: serving-cert
2829
app.kubernetes.io/managed-by: kustomize
29-
app.kubernetes.io/name: certificate
30-
app.kubernetes.io/part-of: openstack-baremetal-operator
30+
app.kubernetes.io/name: openstack-baremetal-operator
3131
name: openstack-baremetal-operator-serving-cert
3232
namespace: '{{ .OperatorNamespace }}'
3333
spec:
@@ -39,21 +39,6 @@ spec:
3939
name: openstack-baremetal-operator-selfsigned-issuer
4040
secretName: openstack-baremetal-operator-webhook-server-cert
4141
---
42-
apiVersion: cert-manager.io/v1
43-
kind: Issuer
44-
metadata:
45-
labels:
46-
app.kubernetes.io/component: certificate
47-
app.kubernetes.io/created-by: openstack-operator
48-
app.kubernetes.io/instance: selfsigned-issuer
49-
app.kubernetes.io/managed-by: kustomize
50-
app.kubernetes.io/name: issuer
51-
app.kubernetes.io/part-of: openstack-baremetal-operator
52-
name: openstack-baremetal-operator-selfsigned-issuer
53-
namespace: '{{ .OperatorNamespace }}'
54-
spec:
55-
selfSigned: {}
56-
---
5742
apiVersion: admissionregistration.k8s.io/v1
5843
kind: MutatingWebhookConfiguration
5944
metadata:

0 commit comments

Comments
 (0)