Merge 9773630 into 074453a

caicloud · Dec 25, 2020 · 9ab8051 · 9ab8051
2 parents 074453a + 9773630
commit 9ab8051
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/manifests/cyclone/templates/controller.yaml b/manifests/cyclone/templates/controller.yaml
@@ -49,8 +49,8 @@ data:
         "pod": 1
       },
       "pvc": "cyclone-server-cyclone-data",
-      "cyclone_server_addr": "{{ .Values.platformConfig.controlClusterVIP }}:6041",
-      "notification_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:6041/apis/v1alpha1/notifications"
+      "cyclone_server_addr": "{{ .Values.platformConfig.controlClusterVIP }}:{{ .Values.server.clusterPort }}",
+      "notification_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:{{ .Values.server.clusterPort }}/apis/v1alpha1/notifications"
     }
 
 ---

diff --git a/manifests/cyclone/templates/server.yaml b/manifests/cyclone/templates/server.yaml
@@ -28,7 +28,7 @@ data:
       "open_control_cluster": {{ .Values.server.openControlCluster }},
       "storage_usage_watcher": {
         "image": "{{ include "cyclone.registry.release" . }}/cyclone-watcher:{{ .Chart.AppVersion }}",
-        "report_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:6041/apis/v1alpha1/storage/usages",
+        "report_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:{{ .Values.server.clusterPort }}/apis/v1alpha1/storage/usages",
         "interval_seconds": "{{ .Values.server.storageWatcher.intervalSeconds }}",
         "resource_requirements": {
           "limits.cpu": "{{ .Values.server.storageWatcher.resourceRequirements.limits.cpu }}",
@@ -195,4 +195,4 @@ spec:
     requests:
       storage: 10Gi
   storageClassName: heketi-storageclass
-  volumeMode: Filesystem
+  volumeMode: Filesystem
diff --git a/manifests/cyclone/values.yaml b/manifests/cyclone/values.yaml
@@ -47,6 +47,8 @@ engine:
 # Cyclone server variables
 server:
   listenAddress: 0.0.0.0
+  # pods in user cluster could access cyclone via `clusterPort`
+  clusterPort: 6043
   listenPort: 7099
   # nodePort: 30011
   webhookUrlPrefix: http://{{ .Values.serverAddress }}/apis/v1alpha1