Skip to content

Commit 75cd2b9

Browse files
committed
Update manifests to install newly introduced csi snapshot metadata service as a part of CSI controller, starting k8s v1.33
1 parent 20aa56b commit 75cd2b9

2 files changed

Lines changed: 198 additions & 20 deletions

File tree

manifests/supervisorcluster/1.33/cns-csi.yaml

Lines changed: 99 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,15 @@ rules:
141141
- apiGroups: ["iaas.vmware.com"]
142142
resources: ["capabilities"]
143143
verbs: ["get", "list", "watch"]
144+
- apiGroups: ["cbt.storage.k8s.io"]
145+
resources: ["snapshotmetadataservices"]
146+
verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
147+
- apiGroups: ["authentication.k8s.io"]
148+
resources: ["tokenreviews"]
149+
verbs: ["create", "get"]
150+
- apiGroups: ["authorization.k8s.io"]
151+
resources: ["subjectaccessreviews"]
152+
verbs: ["create", "get"]
144153
---
145154
kind: ClusterRoleBinding
146155
apiVersion: rbac.authorization.k8s.io/v1
@@ -268,6 +277,58 @@ roleRef:
268277
name: vsphere-csi-configmap-writer
269278
apiGroup: rbac.authorization.k8s.io
270279
---
280+
apiVersion: cert-manager.io/v1
281+
kind: Issuer
282+
metadata:
283+
labels:
284+
app: vsphere-csi-webhook
285+
name: vmware-system-csi-selfsigned-issuer
286+
namespace: vmware-system-csi
287+
spec:
288+
selfSigned: {}
289+
---
290+
apiVersion: cert-manager.io/v1
291+
kind: Certificate
292+
metadata:
293+
labels:
294+
app: vsphere-csi-snapshot-metadata-service
295+
name: vmware-system-csi-snapshot-metadata-service-cert
296+
namespace: vmware-system-csi
297+
spec:
298+
isCA: true
299+
dnsNames:
300+
- vmware-system-csi-snapshot-metadata-service.vmware-system-csi.svc
301+
- vmware-system-csi-snapshot-metadata-service.vmware-system-csi.svc.cluster.local
302+
issuerRef:
303+
kind: Issuer
304+
name: vmware-system-csi-selfsigned-issuer
305+
secretName: vmware-system-csi-snapshot-metadata-service-cert
306+
---
307+
apiVersion: v1
308+
kind: Service
309+
metadata:
310+
name: vmware-system-csi-snapshot-metadata-service
311+
namespace: vmware-system-csi
312+
labels:
313+
app: vsphere-csi-controller
314+
spec:
315+
type: LoadBalancer
316+
ports:
317+
- port: 50051
318+
targetPort: 50051
319+
protocol: TCP
320+
selector:
321+
app: vsphere-csi-controller
322+
---
323+
apiVersion: cbt.storage.k8s.io/v1beta1
324+
kind: SnapshotMetadataService
325+
metadata:
326+
name: csi.vsphere.vmware.com
327+
spec:
328+
address: vmware-system-csi-snapshot-metadata-service.vmware-system-csi.svc:443
329+
audience: csi.vsphere.vmware.com
330+
caCert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURjekNDQWx1Z0F3SUJBZ0lRUldkcFEwVnZVUnlZdHVRNXI0ZVdQREFOQmdrcWhraUc5dzBCQVFzRkFEQUEKTUI0WERUSTJNRE15TkRBNU1URXlPRm9YRFRJMk1ETXlOREV4TVRFeU9Gb3dBRENDQVNJd0RRWUpLb1pJaHZjTgpBUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSmVaakovUG1jWVl1bm44NFkvb1dCMzl4VWFBUTg2dWNMejdBVGZ3CjU5bmJ3aFBwM1hyNmJaWXJlVHJmMytWVFRieDE3cDU3UmhyVDM4bjhPQkRHQkhZMTJvMktuQjdPVmxBaVc1SWoKSUtyTFR1K3dnUlJSeWVjald0UHR1VjdUWHZxTU1ia1pmSHNGd0JMZkZ6ZUpLRWYzK3lvUzU3NmxhbHVXU3dXcApweU5Yem9PSEc0em5BdldRL3dkNytQbjlEQTVmRnVoZ2ZHWDcvUEROa05uVkI4MlI5WXVScExicm1JNzR2WUo3CkFySFRjdnE2dDcwcjhGYnVIZkQ1dUtaVHNhb3JNQVFNRUp4bEhKZk5LVnRaY0x3aXAzT2JaZEFLNkhGcEY0d1MKUkI3M1h6bUZzK3I3bU9mUXRvanNMT0paWnFsdytYNkpJcndMdE5oM0dJQzRKT2NDQXdFQUFhT0I2RENCNVRBTwpCZ05WSFE4QkFmOEVCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWEyQkhGUC9BCnJXUnFvSE01bjFvQURLTUxGaTB3Z2FJR0ExVWRFUUVCL3dTQmx6Q0JsSUpCZG0xM1lYSmxMWE41YzNSbGJTMWoKYzJrdGMyNWhjSE5vYjNRdGJXVjBZV1JoZEdFdGMyVnlkbWxqWlM1MmJYZGhjbVV0YzNsemRHVnRMV056YVM1egpkbU9DVDNadGQyRnlaUzF6ZVhOMFpXMHRZM05wTFhOdVlYQnphRzkwTFcxbGRHRmtZWFJoTFhObGNuWnBZMlV1CmRtMTNZWEpsTFhONWMzUmxiUzFqYzJrdWMzWmpMbU5zZFhOMFpYSXViRzlqWVd3d0RRWUpLb1pJaHZjTkFRRUwKQlFBRGdnRUJBQlcvSitZcExkZUtMdFZWUkZqTkxJRlJBd3FPdTRHMXV2d0NrVWM5VVhXSWM0TDBRRHRKY0JZcAp0REp4bjBncUIwTStOZDdHSi9OR0YvNXVwTWRtRXpDRXJsS21ZeGU0bzI5YXZNU0N5cTNSQlZQUG5aeFZWZTMxCngxRlNHVERqamJaN2R1dnB3SmFUT25pVnVxTUQzZTVCek05NENsNVJYckR3ZmdodEFaZnlyc2J5d0kzL3NCRzIKVHZzcXRRcGNzNVlkaDhwZ0JqaThSb3AraFFTUXBybFNDVG1Ga01BTTV0M2wxMEErY0xibXJ6d0lIb2RWbWRtKwpHYkd6bUYybGN2YkdKb1puR3Jka3Y2Mm9rbFM0Y0RZQmw5ckp5bTBnNVZCZlJoaGhzNkVlVE5aZUxyRlJtNWZaCnJJNmJCQ3VQTW1FNDJRQ2VEcVpZenY3bGNjL2hjenM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
331+
---
271332
kind: Deployment
272333
apiVersion: apps/v1
273334
metadata:
@@ -557,6 +618,41 @@ spec:
557618
volumeMounts:
558619
- mountPath: /csi
559620
name: socket-dir
621+
- name: csi-snapshot-metadata
622+
image: localhost:5000/vmware/csi-snapshot-metadata:v1.0.0_vmware.1
623+
args:
624+
- "--csi-address=$(ADDRESS)"
625+
- "--tls-cert=/etc/vmware/wcp/certs/tls.crt"
626+
- "--tls-key=/etc/vmware/wcp/certs/tls.key"
627+
env:
628+
- name: ADDRESS
629+
value: /csi/csi.sock
630+
ports:
631+
- containerPort: 50051
632+
name: grpc
633+
protocol: TCP
634+
- containerPort: 8080
635+
name: healthz
636+
protocol: TCP
637+
livenessProbe:
638+
httpGet:
639+
path: /healthz
640+
port: healthz
641+
initialDelaySeconds: 30
642+
timeoutSeconds: 10
643+
periodSeconds: 180
644+
failureThreshold: 3
645+
imagePullPolicy: "IfNotPresent"
646+
securityContext:
647+
runAsNonRoot: true
648+
runAsUser: 65534
649+
runAsGroup: 65533
650+
volumeMounts:
651+
- mountPath: /csi
652+
name: socket-dir
653+
- name: csi-snapshot-metadata-server-certs
654+
mountPath: /etc/vmware/wcp/certs
655+
readOnly: true
560656
volumes:
561657
- name: vsphere-config-volume
562658
secret:
@@ -574,6 +670,9 @@ spec:
574670
items:
575671
- key: "ca.crt"
576672
path: "ca.crt"
673+
- name: csi-snapshot-metadata-server-certs
674+
secret:
675+
secretName: vmware-system-csi-snapshot-metadata-service-cert
577676
---
578677
apiVersion: storage.k8s.io/v1
579678
kind: CSIDriver
@@ -656,16 +755,6 @@ spec:
656755
name: vmware-system-csi-selfsigned-issuer
657756
secretName: vmware-system-csi-webhook-service-cert
658757
---
659-
apiVersion: cert-manager.io/v1
660-
kind: Issuer
661-
metadata:
662-
labels:
663-
app: vsphere-csi-webhook
664-
name: vmware-system-csi-selfsigned-issuer
665-
namespace: vmware-system-csi
666-
spec:
667-
selfSigned: {}
668-
---
669758
apiVersion: admissionregistration.k8s.io/v1
670759
kind: ValidatingWebhookConfiguration
671760
metadata:

manifests/supervisorcluster/1.34/cns-csi.yaml

Lines changed: 99 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,15 @@ rules:
141141
- apiGroups: ["iaas.vmware.com"]
142142
resources: ["capabilities"]
143143
verbs: ["get", "list", "watch"]
144+
- apiGroups: ["cbt.storage.k8s.io"]
145+
resources: ["snapshotmetadataservices"]
146+
verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
147+
- apiGroups: ["authentication.k8s.io"]
148+
resources: ["tokenreviews"]
149+
verbs: ["create", "get"]
150+
- apiGroups: ["authorization.k8s.io"]
151+
resources: ["subjectaccessreviews"]
152+
verbs: ["create", "get"]
144153
---
145154
kind: ClusterRoleBinding
146155
apiVersion: rbac.authorization.k8s.io/v1
@@ -268,6 +277,58 @@ roleRef:
268277
name: vsphere-csi-configmap-writer
269278
apiGroup: rbac.authorization.k8s.io
270279
---
280+
apiVersion: cert-manager.io/v1
281+
kind: Issuer
282+
metadata:
283+
labels:
284+
app: vsphere-csi-webhook
285+
name: vmware-system-csi-selfsigned-issuer
286+
namespace: vmware-system-csi
287+
spec:
288+
selfSigned: {}
289+
---
290+
apiVersion: cert-manager.io/v1
291+
kind: Certificate
292+
metadata:
293+
labels:
294+
app: vsphere-csi-snapshot-metadata-service
295+
name: vmware-system-csi-snapshot-metadata-service-cert
296+
namespace: vmware-system-csi
297+
spec:
298+
isCA: true
299+
dnsNames:
300+
- vmware-system-csi-snapshot-metadata-service.vmware-system-csi.svc
301+
- vmware-system-csi-snapshot-metadata-service.vmware-system-csi.svc.cluster.local
302+
issuerRef:
303+
kind: Issuer
304+
name: vmware-system-csi-selfsigned-issuer
305+
secretName: vmware-system-csi-snapshot-metadata-service-cert
306+
---
307+
apiVersion: v1
308+
kind: Service
309+
metadata:
310+
name: vmware-system-csi-snapshot-metadata-service
311+
namespace: vmware-system-csi
312+
labels:
313+
app: vsphere-csi-controller
314+
spec:
315+
type: LoadBalancer
316+
ports:
317+
- port: 50051
318+
targetPort: 50051
319+
protocol: TCP
320+
selector:
321+
app: vsphere-csi-controller
322+
---
323+
apiVersion: cbt.storage.k8s.io/v1beta1
324+
kind: SnapshotMetadataService
325+
metadata:
326+
name: csi.vsphere.vmware.com
327+
spec:
328+
address: vmware-system-csi-snapshot-metadata-service.vmware-system-csi.svc:443
329+
audience: csi.vsphere.vmware.com
330+
caCert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURjekNDQWx1Z0F3SUJBZ0lRUldkcFEwVnZVUnlZdHVRNXI0ZVdQREFOQmdrcWhraUc5dzBCQVFzRkFEQUEKTUI0WERUSTJNRE15TkRBNU1URXlPRm9YRFRJMk1ETXlOREV4TVRFeU9Gb3dBRENDQVNJd0RRWUpLb1pJaHZjTgpBUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSmVaakovUG1jWVl1bm44NFkvb1dCMzl4VWFBUTg2dWNMejdBVGZ3CjU5bmJ3aFBwM1hyNmJaWXJlVHJmMytWVFRieDE3cDU3UmhyVDM4bjhPQkRHQkhZMTJvMktuQjdPVmxBaVc1SWoKSUtyTFR1K3dnUlJSeWVjald0UHR1VjdUWHZxTU1ia1pmSHNGd0JMZkZ6ZUpLRWYzK3lvUzU3NmxhbHVXU3dXcApweU5Yem9PSEc0em5BdldRL3dkNytQbjlEQTVmRnVoZ2ZHWDcvUEROa05uVkI4MlI5WXVScExicm1JNzR2WUo3CkFySFRjdnE2dDcwcjhGYnVIZkQ1dUtaVHNhb3JNQVFNRUp4bEhKZk5LVnRaY0x3aXAzT2JaZEFLNkhGcEY0d1MKUkI3M1h6bUZzK3I3bU9mUXRvanNMT0paWnFsdytYNkpJcndMdE5oM0dJQzRKT2NDQXdFQUFhT0I2RENCNVRBTwpCZ05WSFE4QkFmOEVCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWEyQkhGUC9BCnJXUnFvSE01bjFvQURLTUxGaTB3Z2FJR0ExVWRFUUVCL3dTQmx6Q0JsSUpCZG0xM1lYSmxMWE41YzNSbGJTMWoKYzJrdGMyNWhjSE5vYjNRdGJXVjBZV1JoZEdFdGMyVnlkbWxqWlM1MmJYZGhjbVV0YzNsemRHVnRMV056YVM1egpkbU9DVDNadGQyRnlaUzF6ZVhOMFpXMHRZM05wTFhOdVlYQnphRzkwTFcxbGRHRmtZWFJoTFhObGNuWnBZMlV1CmRtMTNZWEpsTFhONWMzUmxiUzFqYzJrdWMzWmpMbU5zZFhOMFpYSXViRzlqWVd3d0RRWUpLb1pJaHZjTkFRRUwKQlFBRGdnRUJBQlcvSitZcExkZUtMdFZWUkZqTkxJRlJBd3FPdTRHMXV2d0NrVWM5VVhXSWM0TDBRRHRKY0JZcAp0REp4bjBncUIwTStOZDdHSi9OR0YvNXVwTWRtRXpDRXJsS21ZeGU0bzI5YXZNU0N5cTNSQlZQUG5aeFZWZTMxCngxRlNHVERqamJaN2R1dnB3SmFUT25pVnVxTUQzZTVCek05NENsNVJYckR3ZmdodEFaZnlyc2J5d0kzL3NCRzIKVHZzcXRRcGNzNVlkaDhwZ0JqaThSb3AraFFTUXBybFNDVG1Ga01BTTV0M2wxMEErY0xibXJ6d0lIb2RWbWRtKwpHYkd6bUYybGN2YkdKb1puR3Jka3Y2Mm9rbFM0Y0RZQmw5ckp5bTBnNVZCZlJoaGhzNkVlVE5aZUxyRlJtNWZaCnJJNmJCQ3VQTW1FNDJRQ2VEcVpZenY3bGNjL2hjenM9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
331+
---
271332
kind: Deployment
272333
apiVersion: apps/v1
273334
metadata:
@@ -557,6 +618,41 @@ spec:
557618
volumeMounts:
558619
- mountPath: /csi
559620
name: socket-dir
621+
- name: csi-snapshot-metadata
622+
image: localhost:5000/vmware/csi-snapshot-metadata:v1.0.0_vmware.1
623+
args:
624+
- "--csi-address=$(ADDRESS)"
625+
- "--tls-cert=/etc/vmware/wcp/certs/tls.crt"
626+
- "--tls-key=/etc/vmware/wcp/certs/tls.key"
627+
env:
628+
- name: ADDRESS
629+
value: /csi/csi.sock
630+
ports:
631+
- containerPort: 50051
632+
name: grpc
633+
protocol: TCP
634+
- containerPort: 8080
635+
name: healthz
636+
protocol: TCP
637+
livenessProbe:
638+
httpGet:
639+
path: /healthz
640+
port: healthz
641+
initialDelaySeconds: 30
642+
timeoutSeconds: 10
643+
periodSeconds: 180
644+
failureThreshold: 3
645+
imagePullPolicy: "IfNotPresent"
646+
securityContext:
647+
runAsNonRoot: true
648+
runAsUser: 65534
649+
runAsGroup: 65533
650+
volumeMounts:
651+
- mountPath: /csi
652+
name: socket-dir
653+
- name: csi-snapshot-metadata-server-certs
654+
mountPath: /etc/vmware/wcp/certs
655+
readOnly: true
560656
volumes:
561657
- name: vsphere-config-volume
562658
secret:
@@ -574,6 +670,9 @@ spec:
574670
items:
575671
- key: "ca.crt"
576672
path: "ca.crt"
673+
- name: csi-snapshot-metadata-server-certs
674+
secret:
675+
secretName: vmware-system-csi-snapshot-metadata-service-cert
577676
---
578677
apiVersion: storage.k8s.io/v1
579678
kind: CSIDriver
@@ -656,16 +755,6 @@ spec:
656755
name: vmware-system-csi-selfsigned-issuer
657756
secretName: vmware-system-csi-webhook-service-cert
658757
---
659-
apiVersion: cert-manager.io/v1
660-
kind: Issuer
661-
metadata:
662-
labels:
663-
app: vsphere-csi-webhook
664-
name: vmware-system-csi-selfsigned-issuer
665-
namespace: vmware-system-csi
666-
spec:
667-
selfSigned: {}
668-
---
669758
apiVersion: admissionregistration.k8s.io/v1
670759
kind: ValidatingWebhookConfiguration
671760
metadata:

0 commit comments

Comments
 (0)