Fixing other ports also affected

Closed unused port
Fixed formatting
Updated tests

Author: marcleblanc2

charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Deployment.yaml

@@ -47,19 +47,19 @@ spec:
             - name: REGISTRY_PROXY_REMOTEURL
               value: http://registry-1.docker.io
           ports:
-            - containerPort: 5000
-              name: registry
+            - name: http-registry
+              containerPort: 5000
           livenessProbe:
             httpGet:
               path: /
-              port: registry
+              port: http-registry
               scheme: HTTP
             initialDelaySeconds: 5
             timeoutSeconds: 5
           readinessProbe:
             httpGet:
               path: /
-              port: registry
+              port: http-registry
               scheme: HTTP
             periodSeconds: 5
             timeoutSeconds: 5

charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Service.yaml

@@ -13,10 +13,10 @@ metadata:
   name: private-docker-registry
 spec:
   ports:
-    - name: http
+    - name: http-registry
       port: 5000
       protocol: TCP
-      targetPort: 5000
+      targetPort: http-registry
   selector:
     app: private-docker-registry
   type: ClusterIP

charts/sourcegraph/README.md

@@ -195,7 +195,7 @@ In addition to the documented values, all services also support the following va
 | openTelemetry.agent.containerSecurityContext.allowPrivilegeEscalation | bool | `false` |  |
 | openTelemetry.agent.containerSecurityContext.runAsGroup | int | `101` |  |
 | openTelemetry.agent.containerSecurityContext.runAsUser | int | `100` |  |
-| openTelemetry.agent.hostPorts | object | `{"otlpGrpc":4317,"otlpHttp":4318,"zpages":55679}` | Resource requests & limits for the `otel-agent` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
+| openTelemetry.agent.hostPorts | object | `{"grpcOtlp":4317,"httpOtlp":4318,"httpZpages":55679}` | Resource requests & limits for the `otel-agent` container, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | openTelemetry.agent.name | string | `"otel-agent"` | Name used by resources. Does not affect service names or PVCs. |
 | openTelemetry.agent.resources.limits.cpu | string | `"500m"` |  |
 | openTelemetry.agent.resources.limits.memory | string | `"500Mi"` |  |

charts/sourcegraph/templates/_helpers.tpl

@@ -175,7 +175,7 @@ app.kubernetes.io/name: jaeger
     fieldRef:
       fieldPath: status.hostIP
 - name: OTEL_EXPORTER_OTLP_ENDPOINT
-  value: http://$(OTEL_AGENT_HOST):{{ toYaml .Values.openTelemetry.agent.hostPorts.otlpGrpc }}
+  value: http://$(OTEL_AGENT_HOST):{{ toYaml .Values.openTelemetry.agent.hostPorts.grpcOtlp }}
 {{- end }}
 {{- end }}
 

charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml

@@ -55,19 +55,19 @@ spec:
         args: {{- default (list "") .Values.blobstore.args | toYaml | nindent 8 }}
         terminationMessagePolicy: FallbackToLogsOnError
         ports:
-        - containerPort: 9000
-          name: blobstore
+        - name: http
+          containerPort: 9000
         livenessProbe:
           httpGet:
             path: /
-            port: blobstore
+            port: http
             scheme: HTTP
           initialDelaySeconds: 60
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /
-            port: blobstore
+            port: http
             scheme: HTTP
           periodSeconds: 5
           timeoutSeconds: 5

charts/sourcegraph/templates/blobstore/blobstore.Service.yaml

@@ -16,9 +16,9 @@ metadata:
   name: blobstore
 spec:
   ports:
-  - name: blobstore
+  - name: http
     port: 9000
-    targetPort: blobstore
+    targetPort: http
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: blobstore

charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml

@@ -119,12 +119,12 @@ spec:
           periodSeconds: 5
           timeoutSeconds: 5
         ports:
-        - containerPort: 3080
-          name: http
-        - containerPort: 3090
-          name: grpc-internal
-        - containerPort: 6060
-          name: debug
+        - name: debug
+          containerPort: 6060
+        - name: grpc-internal
+          containerPort: 3090
+        - name: http
+          containerPort: 3080
         {{- if not .Values.sourcegraph.localDevMode }}
         resources:
           {{- toYaml .Values.frontend.resources | nindent 10 }}

charts/sourcegraph/templates/gitserver/gitserver.Service.yaml

@@ -23,7 +23,7 @@ spec:
   ports:
   - name: grpc
     port: 3178
-    targetPort: 3178
+    targetPort: grpc
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: gitserver

charts/sourcegraph/templates/indexed-search/indexed-search.IndexerService.yaml

@@ -20,8 +20,9 @@ metadata:
 spec:
   clusterIP: None
   ports:
-    - port: 6072
-      targetPort: 6072
+  - name: http-indexer
+    port: 6072
+    targetPort: http-indexer
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: indexed-search

charts/sourcegraph/templates/indexed-search/indexed-search.Service.yaml

@@ -20,7 +20,9 @@ metadata:
 spec:
   clusterIP: None
   ports:
-  - port: 6070
+  - name: http
+    port: 6070
+    targetPort: http
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}
     app: indexed-search