Merge pull request #89 from wojiushixiaobai/main

fix: RFC 1123

charts/jumpserver/templates/magnus/deployment-magnus.yaml

@@ -63,11 +63,11 @@ spec:
             - name: postgre
               containerPort: {{ .service.postgre.port }}
               protocol: TCP
-            - name: oracle_11g
+            - name: oracle-11g
-              containerPort: {{ .service.oracle_11g.port }}
+              containerPort: {{ .service.oracle-11g.port }}
               protocol: TCP
-            - name: oracle_12c
+            - name: oracle-12c
-              containerPort: {{ .service.oracle_12c.port }}
+              containerPort: {{ .service.oracle-12c.port }}
               protocol: TCP
             {{- end }}
           livenessProbe:

charts/jumpserver/templates/magnus/service-magnus.yaml

@@ -26,14 +26,14 @@ spec:
       targetPort: postgre
       protocol: TCP
       name: postgre
-    - port: {{ .service.oracle_11g.port }}
+    - port: {{ .service.oracle-11g.port }}
-      targetPort: oracle_11g
+      targetPort: oracle-11g
       protocol: TCP
-      name: oracle_11g
+      name: oracle-11g
-    - port: {{ .service.oracle_12c.port }}
+    - port: {{ .service.oracle-12c.port }}
-      targetPort: oracle_12c
+      targetPort: oracle-12c
       protocol: TCP
-      name: oracle_12c
+      name: oracle-12c
     {{- end }}
   sessionAffinity: ClientIP
   sessionAffinityConfig:

charts/jumpserver/values.yaml

@@ -392,9 +392,9 @@ magnus:
       port: 33061
     postgre:
       port: 54320
-    oracle_11g:
+    oracle-11g:
       port: 15211
-    oracle_12c:
+    oracle-12c:
       port: 15212
 
   resources: {}