[WIP] Updating ports

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/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/jaeger/jaeger-collector.Service.yaml

@@ -17,18 +17,14 @@ metadata:
   name: {{ default "jaeger-collector" .Values.jaeger.collector.name }}
 spec:
   ports:
-  - name: jaeger-collector-tchannel
-    port: 14267
-    protocol: TCP
-    targetPort: 14267
-  - name: jaeger-collector-http
+  - name: http-jaeger-collector
     port: 4321
     protocol: TCP
-    targetPort: 4321
-  - name: jaeger-collector-grpc
+    targetPort: http-jaeger-collector
+  - name: grpc-jaeger-collector
     port: 4320
     protocol: TCP
-    targetPort: 4320
+    targetPort: grpc-jaeger-collector
   selector:
     {{- include "sourcegraph.jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/sourcegraph/templates/jaeger/jaeger-query.Service.yaml

@@ -17,10 +17,10 @@ metadata:
   name: {{ default "jaeger-query" .Values.jaeger.query.name }}
 spec:
   ports:
-  - name: query-http
+  - name: http-query
     port: 16686
     protocol: TCP
-    targetPort: 16686
+    targetPort: http-query
   selector:
     {{- include "sourcegraph.jaeger.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/sourcegraph/templates/jaeger/jaeger.Deployment.yaml

@@ -68,13 +68,16 @@ spec:
           protocol: UDP
         - containerPort: 5778
           protocol: TCP
-        - containerPort: 16686
-          protocol: TCP
         - containerPort: 14250
           protocol: TCP
-        - containerPort: 4320
+        - name: grpc-jaeger-collector
+          containerPort: 4320
+          protocol: TCP
+        - name: http-jaeger-collector
+          containerPort: 4321
           protocol: TCP
-        - containerPort: 4321
+        - name: http-query
+          containerPort: 16686
           protocol: TCP
         readinessProbe:
           httpGet:

charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml

@@ -69,15 +69,15 @@ spec:
             path: /
             port: 13133
         ports:
-          - containerPort: 55679
-            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.zpages }}
-            name: zpages
-          - containerPort: 4317
-            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.otlpGrpc }}
-            name: otlp-grpc
-          - containerPort: 4318
-            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.otlpHttp }}
-            name: otlp-http
+          - name: grpc-otlp
+            containerPort: 4317
+            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.grpc-otlp }}
+          - name: http-otlp
+            containerPort: 4318
+            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.http-otlp }}
+          - name: http-zpages
+            containerPort: 55679
+            hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.http-zpages }}
         volumeMounts:
           - name: config
             mountPath: /etc/otel-agent

charts/sourcegraph/templates/otel-collector/otel-collector.Deployment.yaml

@@ -85,14 +85,14 @@ spec:
             path: /
             port: 13133
         ports:
-          - containerPort: 55679
-            name: zpages
-          - containerPort: 4317
-            name: otlp-grpc
-          - containerPort: 4318
-            name: otlp-http
-          - containerPort: 8888
-            name: metrics
+          - name: grpc-otlp
+            containerPort: 4317
+          - name: http-otlp
+            containerPort: 4318
+          - name: http-metrics
+            containerPort: 8888
+          - name: http-zpages
+            containerPort: 55679
         volumeMounts:
           {{- if .Values.openTelemetry.gateway.config.traces.exporters }}
           - name: config

charts/sourcegraph/templates/otel-collector/otel-collector.Service.yaml

@@ -18,15 +18,15 @@ metadata:
     app.kubernetes.io/component: otel-collector
 spec:
   ports:
-    - name: otlp-grpc
+    - name: grpc-otlp
       port: 4317
       protocol: TCP
-      targetPort: 4317
-    - name: otlp-http
+      targetPort: grpc-otlp
+    - name: http-otlp
       port: 4318
       protocol: TCP
-      targetPort: 4318
-    - name: metrics # Default endpoint for querying metrics.
+      targetPort: http-otlp
+    - name: http-metrics
       port: 8888
   selector:
     {{- include "sourcegraph.selectorLabels" . | nindent 4 }}

charts/sourcegraph/templates/prometheus/prometheus.Deployment.yaml

@@ -60,13 +60,13 @@ spec:
         readinessProbe:
           httpGet:
             path: /-/ready
-            port: 9090
+            port: http
           timeoutSeconds: 3
           failureThreshold: 120
           periodSeconds: 5
         ports:
-        - containerPort: 9090
-          name: http
+        - name: http
+          containerPort: 9090
         volumeMounts:
         - mountPath: /prometheus
           name: data