From 1c4586b828a73e56deb5f1ea66c4f29665a74dd6 Mon Sep 17 00:00:00 2001 From: Bradnitski Date: Thu, 16 Nov 2023 09:57:08 +0100 Subject: [PATCH] Remove port 9200 #493 --- .../templates/base_services.yaml | 4 --- .../templates/nodeGroup_services.yaml | 4 --- .../templates/nodeGroup_statefulset.yaml | 3 --- .../create/missingLabelEnvironment.yaml | 2 +- .../v1/xp7deployment/annotated_result.yaml | 11 -------- .../helm/v1/xp7deployment/cluster_result.yaml | 25 ------------------- .../helm/v1/xp7deployment/shared_result.yaml | 25 ------------------- .../xp7deployment/side_containers_result.yaml | 11 -------- .../helm/v1/xp7deployment/simple_result.yaml | 11 -------- kubernetes/example-cluster-shared.yaml | 2 +- kubernetes/example-cluster.yaml | 2 +- kubernetes/example-deployment.yaml | 2 +- kubernetes/example-simple-init-container.yaml | 2 +- kubernetes/example-simple-shared.yaml | 2 +- kubernetes/example-simple.yaml | 2 +- 15 files changed, 7 insertions(+), 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 index 873cb43a..10c180d5 100644 --- 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 index 2fcfb1a7..837c0567 100644 --- 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 index 84885605..dd9c9a09 100644 --- 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/java-operator/src/test/resources/com/enonic/kubernetes/operator/api/xp7deployment/create/missingLabelEnvironment.yaml b/java-operator/src/test/resources/com/enonic/kubernetes/operator/api/xp7deployment/create/missingLabelEnvironment.yaml index e62c0175..21ff77cb 100644 --- a/java-operator/src/test/resources/com/enonic/kubernetes/operator/api/xp7deployment/create/missingLabelEnvironment.yaml +++ b/java-operator/src/test/resources/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/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/annotated_result.yaml b/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/annotated_result.yaml index 2f864c8c..77dff0dd 100644 --- a/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/annotated_result.yaml +++ b/java-operator/src/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/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/cluster_result.yaml b/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/cluster_result.yaml index b7a5499a..77767502 100644 --- a/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/cluster_result.yaml +++ b/java-operator/src/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/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/shared_result.yaml b/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/shared_result.yaml index e1081e1c..941a034d 100644 --- a/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/shared_result.yaml +++ b/java-operator/src/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/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/side_containers_result.yaml b/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/side_containers_result.yaml index de27b639..486044a2 100644 --- a/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/side_containers_result.yaml +++ b/java-operator/src/test/resources/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/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/simple_result.yaml b/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/simple_result.yaml index 521d5cd4..3193e55d 100644 --- a/java-operator/src/test/resources/com/enonic/kubernetes/operator/helm/v1/xp7deployment/simple_result.yaml +++ b/java-operator/src/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 index 575d9e64..a53e548b 100644 --- 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 index 25e0b74d..3e55a57a 100644 --- 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 index 45f7181a..8f633292 100644 --- 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 index a54ffc77..17458b36 100644 --- 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 index 77a346cf..36929808 100644 --- 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 index b5289f5b..68ac5d20 100644 --- 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: