Merge remote-tracking branch 'origin/main' into main

xiaomao23zhi · Aug 3, 2022 · a4204b1 · a4204b1
2 parents b5f3f42 + b327b51
commit a4204b1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/charts/alluxio-ingress.yaml b/charts/alluxio-ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     traefik.frontend.rule.type: PathPrefixStrip
 spec:
   rules:
-    - host: alluxio.matrix.cmcc
+    - host: alluxio.magnote.pub
       http:
         paths:
           - path: /

diff --git a/charts/spark-history-server-config.yaml b/charts/spark-history-server-config.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: harbor.datamodel.jiutian.hq.cmcc:8089/spark/spark
+  repository: harbor.magnote.pub/spark/spark
   tag: v3.1.1
   pullPolicy: IfNotPresent
 

diff --git a/charts/spark-operator-config.yaml b/charts/spark-operator-config.yaml
@@ -30,7 +30,7 @@ uiService:
 
 # -- Ingress URL format.
 # Requires the UI service to be enabled by setting `uiService.enable` to true.
-ingressUrlFormat: "kshjm.cmcc.mobile.cn/{{$appNamespace}}/{{$appName}}"
+ingressUrlFormat: "magnote.pub/{{$appNamespace}}/{{$appName}}"
 
 webhook:
   # -- Enable webhook server

diff --git a/examples/spark-pi.yaml b/examples/spark-pi.yaml
@@ -24,7 +24,7 @@ metadata:
 spec:
   type: Python
   mode: cluster
-  image: "harbor.datamodel.jiutian.hq.cmcc:8089/spark/spark:v3.1.1"
+  image: "harbor.magnote.pub/spark/spark:v3.1.1"
   mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.1.1.jar
   mainClass: org.apache.spark.examples.SparkPi
   sparkConf:

diff --git a/examples/spark-word-count-alluxio.yaml b/examples/spark-word-count-alluxio.yaml
@@ -25,7 +25,7 @@ spec:
   type: Scala
   pythonVersion: "3"
   mode: cluster
-  image: "harbor.datamodel.jiutian.hq.cmcc:8089/spark/spark:v3.1.1"
+  image: "harbor.magnote.pub/spark/spark:v3.1.1"
   mainApplicationFile: local:///opt/spark/examples/jars/spark-examples_2.12-3.1.1.jar
   mainClass: org.apache.spark.examples.JavaWordCount
   arguments:
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ metadata: @@
         traefik.frontend.rule.type: PathPrefixStrip
     spec:
       rules:
-        - host: alluxio.matrix.cmcc
+        - host: alluxio.magnote.pub
           http:
             paths:
               - path: /
@@ Expand Down @@