Remove port 9200 #493

enonic · Nov 16, 2023 · 1c4586b · 1c4586b
1 parent 93f8b8f
commit 1c4586b
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 101 deletions.
diff --git a/java-operator/src/main/helm/v1/xp7deployment/templates/base_services.yaml b/java-operator/src/main/helm/v1/xp7deployment/templates/base_services.yaml
@@ -69,7 +69,3 @@ spec:
       port: 8080
       targetPort: 8080
       protocol: TCP
-    - name: es-api
-      port: 9200
-      targetPort: 9200
-      protocol: TCP
diff --git a/java-operator/src/main/helm/v1/xp7deployment/templates/nodeGroup_services.yaml b/java-operator/src/main/helm/v1/xp7deployment/templates/nodeGroup_services.yaml
@@ -37,9 +37,5 @@ spec:
       port: 8080
       targetPort: 8080
       protocol: TCP
-    - name: es-api
-      port: 9200
-      targetPort: 9200
-      protocol: TCP
 ---
 {{- end }}
diff --git a/java-operator/src/main/helm/v1/xp7deployment/templates/nodeGroup_statefulset.yaml b/java-operator/src/main/helm/v1/xp7deployment/templates/nodeGroup_statefulset.yaml
@@ -153,9 +153,6 @@ spec:
             - name: xp-main
               containerPort: 8080
               protocol: TCP
-            - name: es-http
-              containerPort: 9200
-              protocol: TCP
             - name: es-transport
               containerPort: 9300
               protocol: TCP

diff --git a/...rces/com/enonic/kubernetes/operator/api/xp7deployment/create/missingLabelEnvironment.yaml b/...rces/com/enonic/kubernetes/operator/api/xp7deployment/create/missingLabelEnvironment.yaml
@@ -16,7 +16,7 @@ admissionRequest:
           service: myservice
       spec:
         enabled: true
-        xpVersion: 7.13.2
+        xpVersion: 7.13.4
         nodesSharedDisks:
           - name: blobstore
             size: 1Gi

diff --git a/...test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/annotated_result.yaml b/...test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/annotated_result.yaml
@@ -455,10 +455,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
   sessionAffinity: "None"
@@ -499,10 +495,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "fisk"
@@ -618,9 +610,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"

diff --git a/...c/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/cluster_result.yaml b/...c/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/cluster_result.yaml
@@ -540,10 +540,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
   sessionAffinity: "None"
@@ -584,10 +580,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "master"
@@ -629,10 +621,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "data"
@@ -674,10 +662,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "frontend"
@@ -799,9 +783,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"
@@ -1084,9 +1065,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"
@@ -1392,9 +1370,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"

diff --git a/...rc/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/shared_result.yaml b/...rc/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/shared_result.yaml
@@ -540,10 +540,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
   sessionAffinity: "None"
@@ -584,10 +580,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "master"
@@ -629,10 +621,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "data"
@@ -674,10 +662,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "frontend"
@@ -799,9 +783,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"
@@ -1066,9 +1047,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"
@@ -1382,9 +1360,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"

diff --git a/...esources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/side_containers_result.yaml b/...esources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/side_containers_result.yaml
@@ -455,10 +455,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
   sessionAffinity: "None"
@@ -499,10 +495,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "fisk"
@@ -615,9 +607,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"

diff --git a/...rc/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/simple_result.yaml b/...rc/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/simple_result.yaml
@@ -455,10 +455,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
   sessionAffinity: "None"
@@ -499,10 +495,6 @@ spec:
       port: 8080
       protocol: "TCP"
       targetPort: 8080
-    - name: "es-api"
-      port: 9200
-      protocol: "TCP"
-      targetPort: 9200
   selector:
     enonic.deployment: "mycloud-mysolution-myenv-myservice"
     enonic.nodeGroup: "fisk"
@@ -622,9 +614,6 @@ spec:
             - containerPort: 8080
               name: "xp-main"
               protocol: "TCP"
-            - containerPort: 9200
-              name: "es-http"
-              protocol: "TCP"
             - containerPort: 9300
               name: "es-transport"
               protocol: "TCP"

diff --git a/kubernetes/example-cluster-shared.yaml b/kubernetes/example-cluster-shared.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: my-namespace
 spec:
   enabled: true
-  xpVersion: 7.13.2
+  xpVersion: 7.13.4
 
   nodesSharedVolumes:
     - name: shared

diff --git a/kubernetes/example-cluster.yaml b/kubernetes/example-cluster.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: my-namespace
 spec:
   enabled: true
-  xpVersion: 7.13.2
+  xpVersion: 7.13.4
 
   # Create volumes shared by all nodes in this deployment
   nodesSharedDisks:

diff --git a/kubernetes/example-deployment.yaml b/kubernetes/example-deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     service: myservice
 spec:
   enabled: true
-  xpVersion: 7.13.2
+  xpVersion: 7.13.4
 
   nodesSharedDisks:
     - name: blobstore

diff --git a/kubernetes/example-simple-init-container.yaml b/kubernetes/example-simple-init-container.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: my-namespace
 spec:
   enabled: true
-  xpVersion: 7.13.2
+  xpVersion: 7.13.4
 
   nodesSharedVolumes:
     - name: shared

diff --git a/kubernetes/example-simple-shared.yaml b/kubernetes/example-simple-shared.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: my-namespace
 spec:
   enabled: true
-  xpVersion: 7.13.2
+  xpVersion: 7.13.4
 
   nodesSharedVolumes:
     - name: shared

diff --git a/kubernetes/example-simple.yaml b/kubernetes/example-simple.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: my-namespace
 spec:
   enabled: true
-  xpVersion: 7.13.2
+  xpVersion: 7.13.4
 
   # Create one node
   nodeGroups: