pref: remove-webcli

goodrain · Jun 14, 2024 · a6bd1e5 · a6bd1e5
1 parent f5133c3
commit a6bd1e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 51 deletions.
diff --git a/templates/rbdcomponent_helm.yaml b/templates/rbdcomponent_helm.yaml
@@ -208,52 +208,7 @@ items:
     {{- end }}
     imagePullPolicy: {{ .Values.Cluster.imagePullPolicy }}
     priorityComponent: false
-    replicas: 1 
-
-- apiVersion: rainbond.io/v1alpha1
-  kind: RbdComponent
-  metadata:
-    labels:
-      belongTo: rainbond-operator
-      creator: Rainbond
-      name: rbd-webcli
-    name: rbd-webcli
-    namespace: {{ .Release.Namespace }}
-  spec:
-    {{- if .Values.Component.rbd_webcli.args }}
-    args:
-    {{- range .Values.Component.rbd_webcli.args }}
-    - {{ . | toString  }}
-    {{- end }} 
-    {{- end }}
-    {{- if .Values.Component.rbd_webcli.env }}
-    env:
-    {{- range $key,$value := .Values.Component.rbd_webcli.env }}
-    - name: {{ $key }}
-      value: "{{ $value }}"
-    {{- end }}
-    {{- end }}
-    {{- if .Values.Component.rbd_webcli.volumeMounts }}
-    volumeMounts:
-{{ toYaml .Values.Component.rbd_webcli.volumeMounts | indent 4 }}
-    {{- end }}
-    {{- if .Values.Component.rbd_webcli.volumes }}
-    volumes:
-{{ toYaml .Values.Component.rbd_webcli.volumes | indent 4 }}
-    {{- end }}
-    {{- if .Values.Component.rbd_webcli.image }}
-    image: {{ .Values.Component.rbd_webcli.image }}
-    {{- else }}
-    image: {{ .Values.Cluster.rainbondImageRepository }}/rbd-webcli:{{ .Values.Cluster.installVersion }}
-    {{- end }}
-    imagePullPolicy: {{ .Values.Cluster.imagePullPolicy }}
-    priorityComponent: false
-    {{- if .Values.Cluster.enableHA  }} 
-    replicas: {{ .Values.Cluster.replicas }}
-    {{ else }}
     replicas: 1
-    {{- end }}
-
 
 - apiVersion: rainbond.io/v1alpha1
   kind: RbdComponent

diff --git a/values.yaml b/values.yaml
@@ -20,14 +20,14 @@ rbac:
 ## Service account name and whether to create it
 serviceAccount:
   create: true
-  name: nb-operator
+  name: rainbond-operator
 
 # Use K3s Containerd
 useK3sContainerd: false
 
 # rainbondOperator
 operator:
-  name: nb-operator
+  name: rainbond-operator
   # operator environment variable, ref: https://www.rainbond.com/docs/ops-guide/management/change-ports
   # env:
   # - name: API_PORT
@@ -166,10 +166,7 @@ Component:
   # rbd-resource-proxy component configuration  
   rbd_resource_proxy:
     args:
-
-  # rbd-webcli component configuration  
-  rbd_webcli:
-    args:
+
 
   # rbd-monitor component configuration    
   rbd_monitor: