Skip to content

Commit cc1487d

Browse files
committed
Update serving cert names to be consistent with thanos query
1 parent 937414b commit cc1487d

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

Diff for: magefiles/operator.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,13 @@ func operatorDeployment(namespace string, m TemplateMaps) *appsv1.Deployment {
861861
"--tls-cert-file=/etc/tls/private/tls.crt",
862862
"--tls-private-key-file=/etc/tls/private/tls.key",
863863
},
864+
VolumeMounts: []corev1.VolumeMount{
865+
{
866+
Name: "tls",
867+
MountPath: "/etc/tls/private",
868+
ReadOnly: true,
869+
},
870+
},
864871
Ports: []corev1.ContainerPort{
865872
{
866873
ContainerPort: 8443,
@@ -923,22 +930,16 @@ func operatorDeployment(namespace string, m TemplateMaps) *appsv1.Deployment {
923930
Drop: []corev1.Capability{"ALL"},
924931
},
925932
},
926-
VolumeMounts: []corev1.VolumeMount{
927-
{
928-
Name: "kube-rbac-proxy-tls",
929-
MountPath: "/etc/tls/private",
930-
ReadOnly: true,
931-
},
932-
},
933933
},
934934
},
935935
Volumes: []corev1.Volume{
936936
{
937-
Name: "kube-rbac-proxy-tls",
937+
Name: "tls",
938938
VolumeSource: corev1.VolumeSource{
939939
Secret: &corev1.SecretVolumeSource{
940-
SecretName: "kube-rbac-proxy-tls",
941-
Optional: ptr.To(false),
940+
SecretName: "kube-rbac-proxy-tls",
941+
DefaultMode: ptr.To(int32(420)),
942+
Optional: ptr.To(false),
942943
},
943944
},
944945
},

Diff for: resources/services/bundle/staging/operator.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ objects:
8989
capabilities:
9090
drop:
9191
- ALL
92+
volumeMounts:
93+
- mountPath: /etc/tls/private
94+
name: tls
95+
readOnly: true
9296
- args:
9397
- --health-probe-bind-address=:8081
9498
- --metrics-bind-address=127.0.0.1:8080
@@ -132,17 +136,14 @@ objects:
132136
capabilities:
133137
drop:
134138
- ALL
135-
volumeMounts:
136-
- mountPath: /etc/tls/private
137-
name: kube-rbac-proxy-tls
138-
readOnly: true
139139
securityContext:
140140
runAsNonRoot: true
141141
serviceAccountName: thanos-operator-controller-manager
142142
terminationGracePeriodSeconds: 10
143143
volumes:
144-
- name: kube-rbac-proxy-tls
144+
- name: tls
145145
secret:
146+
defaultMode: 420
146147
optional: false
147148
secretName: kube-rbac-proxy-tls
148149
status: {}

0 commit comments

Comments
 (0)