fix: operator information changes (#514)

Co-authored-by: xueshan <xueshan@xiaomi.com> Co-authored-by: wodiwudi <40229449+wodiwudi@users.noreply.github.com>
apache · Nov 20, 2024 · 4100d7f · 4100d7f
1 parent 814625d
commit 4100d7f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/ozhera-operator/ozhera-operator-server/Dockerfile b/ozhera-operator/ozhera-operator-server/Dockerfile
@@ -14,6 +14,6 @@
 # limitations under the License.
 FROM openjdk:21-jdk-bookworm
 
-COPY ./target/ozhera-operator-server-1.0-jdk21.jar /home/work/ozhera-operator-server-1.0-SNAPSHOT.jar
+COPY ./target/ozhera-operator-server-2.0.0-SNAPSHOT.jar /home/work/ozhera-operator-server-1.0-SNAPSHOT.jar
 
-ENTRYPOINT ["sh","-c","java -XX:+UseZGC --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/sun.reflect=ALL-UNNAMED --add-opens java.base/java.xml=ALL-UNNAMED --add-exports java.base/sun.reflect.annotation=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-exports java.xml/com.sun.org.apache.xerces.internal.impl.dv.util=ALL-UNNAMED -Duser.timezone=Asia/Shanghai -jar /home/work/ozhera-operator-server-1.0-SNAPSHOT.jar"]
+ENTRYPOINT ["sh","-c","java -XX:+UseZGC --enable-preview --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/sun.reflect=ALL-UNNAMED --add-opens java.base/java.xml=ALL-UNNAMED --add-exports java.base/sun.reflect.annotation=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-exports java.xml/com.sun.org.apache.xerces.internal.impl.dv.util=ALL-UNNAMED -Duser.timezone=Asia/Shanghai -jar /home/work/ozhera-operator-server-1.0-SNAPSHOT.jar"]
diff --git a/ozhera-operator/ozhera-operator-server/pom.xml b/ozhera-operator/ozhera-operator-server/pom.xml
@@ -60,6 +60,16 @@ http://www.apache.org/licenses/LICENSE-2.0
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>1.33</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 
     <build>
         <plugins>

diff --git a/ozhera-operator/ozhera-operator-server/src/main/resources/config.properties b/ozhera-operator/ozhera-operator-server/src/main/resources/config.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 log.path=/home/work/log/ozhera-operator
-crd=mone:run.mone.hera.operator.bo.HeraBootstrap:run.mone.hera.operator.bo.HeraBootstrapList:heraClient:HeraResourceEventHandler
+crd=mone:org.apache.ozhera.operator.bo.HeraBootstrap:org.apache.ozhera.operator.bo.HeraBootstrapList:heraClient:HeraResourceEventHandler
diff --git a/...hera-operator-server/src/main/resources/ozhera_init/alertManager/ozhera_alertmanager.yaml b/...hera-operator-server/src/main/resources/ozhera_init/alertManager/ozhera_alertmanager.yaml
@@ -96,7 +96,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: local-storage
   local:
-    path: /home/work/alertmanager_hera_namespace_pv
+    path: /home/work/alertmanager_ozhera_namespace_pv
   nodeAffinity:
     required:
       nodeSelectorTerms:

diff --git a/...perator/ozhera-operator-server/src/main/resources/ozhera_init/grafana/ozhera_grafana.yaml b/...perator/ozhera-operator-server/src/main/resources/ozhera_init/grafana/ozhera_grafana.yaml
@@ -1656,7 +1656,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: local-storage
   local:
-    path: /home/work/grafana_hera_namespace_pv
+    path: /home/work/grafana_ozhera_namespace_pv
   nodeAffinity:
     required:
       nodeSelectorTerms:

diff --git a/...r/ozhera-operator-server/src/main/resources/ozhera_init/prometheus/ozhera_prometheus.yaml b/...r/ozhera-operator-server/src/main/resources/ozhera_init/prometheus/ozhera_prometheus.yaml
@@ -80,7 +80,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   storageClassName: local-storage
   local:
-    path: /home/work/prometheus_hera_namespace_pv
+    path: /home/work/prometheus_ozhera_namespace_pv
   nodeAffinity:
     required:
       nodeSelectorTerms:

diff --git a/...or-service/src/main/java/org/apache/ozhera/operator/handler/HeraResourceEventHandler.java b/...or-service/src/main/java/org/apache/ozhera/operator/handler/HeraResourceEventHandler.java
@@ -251,8 +251,9 @@ private void initTpc(String action) {
         }
     }
 
-    private void initNacos(String action, String nacosAddress, String pwd, List<PropConf> propConfList) {
+    private void initNacos(String action, String nacosAddress, String pwd, List<PropConf> propConfList) throws InterruptedException {
         log.warn("initNacos begin nacosAddress:{}", nacosAddress);
+        Thread.sleep(1000 * 30);
         String url = String.format("http://%s/nacos/v1/ns/cluster/enable?level=4&pwd=%s", nacosAddress, pwd);
         String nacosEnable = HttpClientV6.get(url, new HashMap<>(), 2000);
         if (!"ok".equals(nacosEnable)) {