From 9e3706074a2f569699566e5ceeeb0b9ca8faf582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 25 Jul 2022 16:34:56 +0800
Subject: [PATCH] fix: RFC 1123

---
 .../templates/magnus/deployment-magnus.yaml          |  8 ++++----
 .../jumpserver/templates/magnus/service-magnus.yaml  | 12 ++++++------
 charts/jumpserver/values.yaml                        |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/charts/jumpserver/templates/magnus/deployment-magnus.yaml b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
index 8f1dd2c..e998b62 100644
--- a/charts/jumpserver/templates/magnus/deployment-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/deployment-magnus.yaml
@@ -63,11 +63,11 @@ spec:
             - name: postgre
               containerPort: {{ .service.postgre.port }}
               protocol: TCP
-            - name: oracle_11g
-              containerPort: {{ .service.oracle_11g.port }}
+            - name: oracle-11g
+              containerPort: {{ .service.oracle-11g.port }}
               protocol: TCP
-            - name: oracle_12c
-              containerPort: {{ .service.oracle_12c.port }}
+            - name: oracle-12c
+              containerPort: {{ .service.oracle-12c.port }}
               protocol: TCP
             {{- end }}
           livenessProbe:
diff --git a/charts/jumpserver/templates/magnus/service-magnus.yaml b/charts/jumpserver/templates/magnus/service-magnus.yaml
index 3e1a8ae..2ea89ad 100644
--- a/charts/jumpserver/templates/magnus/service-magnus.yaml
+++ b/charts/jumpserver/templates/magnus/service-magnus.yaml
@@ -26,14 +26,14 @@ spec:
       targetPort: postgre
       protocol: TCP
       name: postgre
-    - port: {{ .service.oracle_11g.port }}
-      targetPort: oracle_11g
+    - port: {{ .service.oracle-11g.port }}
+      targetPort: oracle-11g
       protocol: TCP
-      name: oracle_11g
-    - port: {{ .service.oracle_12c.port }}
-      targetPort: oracle_12c
+      name: oracle-11g
+    - port: {{ .service.oracle-12c.port }}
+      targetPort: oracle-12c
       protocol: TCP
-      name: oracle_12c
+      name: oracle-12c
     {{- end }}
   sessionAffinity: ClientIP
   sessionAffinityConfig:
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index 84d407b..f17516a 100644
--- a/charts/jumpserver/values.yaml
+++ b/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: {}