Procházet zdrojové kódy

fix: 修复ingress更新失败问题

TianChenjiang před 5 roky
rodič
revize
b1a9b513b0

+ 1 - 2
src/main/java/cn/seecoder/paas/service/facade/k8s/impl/IngressApiImpl.java

@@ -49,7 +49,6 @@ public class IngressApiImpl implements IngressApi {
     @Override
     public Ingress create(Ingress ingress) {
         ExtensionsV1beta1Ingress ExtensionsV1beta1Ingress = ingress.toK8sObject();
-
         try {
             ExtensionsV1beta1Ingress result = extensionsV1beta1Api.createNamespacedIngress(
                     ingress.getNamespace(),
@@ -85,7 +84,7 @@ public class IngressApiImpl implements IngressApi {
     @Override
     public Ingress update(Ingress ingress) {
         try {
-            ExtensionsV1beta1Ingress v1Ingress = getV1Ingress(ingress.getNamespace(), ingress.getNamespace());
+            ExtensionsV1beta1Ingress v1Ingress = getV1Ingress(ingress.getNamespace(), ingress.getName());
             ingress.merge(v1Ingress);
             v1Ingress = extensionsV1beta1Api.replaceNamespacedIngress(
                     ingress.getName(),

+ 1 - 1
src/main/java/cn/seecoder/paas/service/facade/k8s/model/Ingress.java

@@ -201,7 +201,7 @@ public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
      * @param extensionsV1beta1Ingress 原有的ingress
      */
     public void merge(ExtensionsV1beta1Ingress extensionsV1beta1Ingress) {
-        extensionsV1beta1Ingress.getMetadata().setName(getName());
+        extensionsV1beta1Ingress.getMetadata().setName(this.getName());
         extensionsV1beta1Ingress.getMetadata().setNamespace(this.getNamespace());
         extensionsV1beta1Ingress.getMetadata().setLabels(this.getLabels());
         extensionsV1beta1Ingress.getMetadata().setAnnotations(this.getAnnotations());