feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #15433 from SkalaNetworks/master

Browse Source 
fix(csi-addons): bind cephfs and rbd provisionners on non-colliding p…
This commit is contained in:
Travis Nielsen
2025-02-24 12:06:57 -07:00
committed by GitHub
parent 84fc8afade d3c3d25c60
commit 4eed2a644f
8 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/csi/csi.go
+12
View File
@@ -97,10 +97,22 @@ func (r *ReconcileCSI) setParams() error {
if err != nil {
return errors.Wrap(err, "error getting CSI CephFS liveness metrics port.")
}
CSIParam.CSIAddonsPort, err = getPortFromConfig(r.opConfig.Parameters, "CSIADDONS_PORT", DefaultCSIAddonsPort)
if err != nil {
return errors.Wrap(err, "failed to get CSI Addons port")
}
CSIParam.CSIAddonsRBDProvisionerPort, err = getPortFromConfig(r.opConfig.Parameters, "CSIADDONS_RBD_PROVISIONER_PORT", DefaultCSIAddonsRBDProvisionerPort)
if err != nil {
return errors.Wrap(err, "failed to get CSI Addons port for RBD provisioner")
}
CSIParam.CSIAddonsCephFSProvisionerPort, err = getPortFromConfig(r.opConfig.Parameters, "CSIADDONS_CEPHFS_PROVISIONER_PORT", DefaultCSIAddonsCephFSProvisionerPort)
if err != nil {
return errors.Wrap(err, "failed to get CSI Addons port for Ceph FS provisioner")
}
CSIParam.RBDLivenessMetricsPort, err = getPortFromConfig(r.opConfig.Parameters, "CSI_RBD_LIVENESS_METRICS_PORT", DefaultRBDLivenessMerticsPort)
if err != nil {
return errors.Wrap(err, "error getting CSI RBD liveness metrics port.")
pkg/operator/ceph/csi/spec.go
+10 -6
View File
@@ -83,6 +83,8 @@ type Param struct {
SidecarLogLevel uint8
CephFSLivenessMetricsPort uint16
CSIAddonsPort uint16
CSIAddonsRBDProvisionerPort uint16
CSIAddonsCephFSProvisionerPort uint16
RBDLivenessMetricsPort uint16
KubeApiBurst uint16
KubeApiQPS float32
@@ -219,12 +221,14 @@ const (
// kubelet directory path
DefaultKubeletDirPath = "/var/lib/kubelet"
// grpc metrics and liveness port for cephfs and rbd
DefaultCephFSGRPCMerticsPort uint16 = 9091
DefaultCephFSLivenessMerticsPort uint16 = 9081
DefaultRBDGRPCMerticsPort uint16 = 9090
DefaultRBDLivenessMerticsPort uint16 = 9080
DefaultCSIAddonsPort uint16 = 9070
// gRPC metrics and liveness port for CephFS and RBD
DefaultCephFSGRPCMerticsPort uint16 = 9091
DefaultCephFSLivenessMerticsPort uint16 = 9081
DefaultRBDGRPCMerticsPort uint16 = 9090
DefaultRBDLivenessMerticsPort uint16 = 9080
DefaultCSIAddonsPort uint16 = 9070
DefaultCSIAddonsRBDProvisionerPort uint16 = 9070
DefaultCSIAddonsCephFSProvisionerPort uint16 = 9070
// default log level for csi containers
defaultLogLevel uint8 = 0
pkg/operator/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml
+2 -2
View File
@@ -216,7 +216,7 @@ spec:
- "--node-id=$(NODE_ID)"
- "--v={{ .LogLevel }}"
- "--csi-addons-address=$(CSIADDONS_ENDPOINT)"
- "--controller-port={{ .CSIAddonsPort }}"
- "--controller-port={{ .CSIAddonsCephFSProvisionerPort }}"
- "--pod=$(POD_NAME)"
- "--namespace=$(POD_NAMESPACE)"
- "--pod-uid=$(POD_UID)"
@@ -231,7 +231,7 @@ spec:
- "--log_file={{ .CsiLogRootPath }}/log/{{ .CsiComponentName }}/csi-addons.log"
{{ end }}
ports:
- containerPort: {{ .CSIAddonsPort }}
- containerPort: {{ .CSIAddonsCephFSProvisionerPort }}
env:
- name: NODE_ID
valueFrom:
pkg/operator/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml
+2 -2
View File
@@ -169,7 +169,7 @@ spec:
- "--node-id=$(NODE_ID)"
- "--v={{ .LogLevel }}"
- "--csi-addons-address=$(CSIADDONS_ENDPOINT)"
- "--controller-port={{ .CSIAddonsPort }}"
- "--controller-port={{ .CSIAddonsRBDProvisionerPort }}"
- "--pod=$(POD_NAME)"
- "--namespace=$(POD_NAMESPACE)"
- "--pod-uid=$(POD_UID)"
@@ -184,7 +184,7 @@ spec:
- "--log_file={{ .CsiLogRootPath }}/log/{{ .CsiComponentName }}/csi-addons.log"
{{ end }}
ports:
- containerPort: {{ .CSIAddonsPort }}
- containerPort: {{ .CSIAddonsRBDProvisionerPort }}
env:
- name: NODE_ID
valueFrom: