Merge pull request #165 from metalmatze/config-ports

Create high level config for ports that get use by other objects

Author: kakkoyun

examples/all/manifests/thanos-bucket-service.yaml

@@ -12,7 +12,7 @@ spec:
   ports:
   - name: http
     port: 10902
-    targetPort: http
+    targetPort: 10902
   selector:
     app.kubernetes.io/component: object-store-bucket-debugging
     app.kubernetes.io/instance: thanos-bucket

examples/all/manifests/thanos-compact-service.yaml

@@ -12,7 +12,7 @@ spec:
   ports:
   - name: http
     port: 10902
-    targetPort: http
+    targetPort: 10902
   selector:
     app.kubernetes.io/component: database-compactor
     app.kubernetes.io/instance: thanos-compact

examples/all/manifests/thanos-query-frontend-service.yaml

@@ -12,7 +12,7 @@ spec:
   ports:
   - name: http
     port: 9090
-    targetPort: http
+    targetPort: 9090
   selector:
     app.kubernetes.io/component: query-cache
     app.kubernetes.io/instance: thanos-query-frontend

examples/all/manifests/thanos-receive-service.yaml

@@ -13,13 +13,13 @@ spec:
   ports:
   - name: grpc
     port: 10901
-    targetPort: grpc
+    targetPort: 10901
   - name: http
     port: 10902
-    targetPort: http
+    targetPort: 10902
   - name: remote-write
     port: 19291
-    targetPort: remote-write
+    targetPort: 19291
   selector:
     app.kubernetes.io/component: database-write-hashring
     app.kubernetes.io/instance: thanos-receive

examples/all/manifests/thanos-rule-service.yaml

@@ -13,10 +13,10 @@ spec:
   ports:
   - name: grpc
     port: 10901
-    targetPort: grpc
+    targetPort: 10901
   - name: http
     port: 10902
-    targetPort: http
+    targetPort: 10902
   selector:
     app.kubernetes.io/component: rule-evaluation-engine
     app.kubernetes.io/instance: thanos-rule

examples/all/manifests/thanos-store-service.yaml

@@ -13,10 +13,10 @@ spec:
   ports:
   - name: grpc
     port: 10901
-    targetPort: grpc
+    targetPort: 10901
   - name: http
     port: 10902
-    targetPort: http
+    targetPort: 10902
   selector:
     app.kubernetes.io/component: object-store-gateway
     app.kubernetes.io/instance: thanos-store

jsonnet/kube-thanos/kube-thanos-bucket.libsonnet

@@ -7,6 +7,9 @@ local defaults = {
   objectStorageConfig: error 'must provide objectStorageConfig',
   resources: {},
   logLevel: 'info',
+  ports: {
+    http: 10902,
+  },
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-bucket',
@@ -41,7 +44,17 @@ function(params) {
         labels: tb.config.commonLabels,
       },
       spec: {
-        ports: [{ name: 'http', targetPort: 'http', port: 10902 }],
+        ports: [
+          {
+            assert std.isString(name),
+            assert std.isNumber(tb.config.ports[name]),
+
+            name: name,
+            port: tb.config.ports[name],
+            targetPort: tb.config.ports[name],
+          }
+          for name in std.objectFields(tb.config.ports)
+        ],
         selector: tb.config.podLabelSelector,
       },
     },
@@ -63,15 +76,18 @@ function(params) {
           name: tb.config.objectStorageConfig.name,
         } } },
       ],
-      ports: [{ name: 'http', containerPort: tb.service.spec.ports[0].port }],
+      ports: [
+        { name: name, containerPort: tb.config.ports[name] }
+        for name in std.objectFields(tb.config.ports)
+      ],
       livenessProbe: { failureThreshold: 4, periodSeconds: 30, httpGet: {
         scheme: 'HTTP',
-        port: tb.service.spec.ports[0].port,
+        port: tb.config.ports.http,
         path: '/-/healthy',
       } },
       readinessProbe: { failureThreshold: 20, periodSeconds: 5, httpGet: {
         scheme: 'HTTP',
-        port: tb.service.spec.ports[0].port,
+        port: tb.config.ports.http,
         path: '/-/ready',
       } },
       resources: if tb.config.resources != {} then tb.config.resources else {},

jsonnet/kube-thanos/kube-thanos-compact.libsonnet

@@ -15,6 +15,9 @@ local defaults = {
   deleteDelay: '48h',
   disableDownsampling: false,
   deduplicationReplicaLabels: [],
+  ports: {
+    http: 10902,
+  },
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-compact',
@@ -53,7 +56,17 @@ function(params) {
       },
       spec: {
         selector: tc.config.podLabelSelector,
-        ports: [{ name: 'http', targetPort: 'http', port: 10902 }],
+        ports: [
+          {
+            assert std.isString(name),
+            assert std.isNumber(tc.config.ports[name]),
+
+            name: name,
+            port: tc.config.ports[name],
+            targetPort: tc.config.ports[name],
+          }
+          for name in std.objectFields(tc.config.ports)
+        ],
       },
     },
 
@@ -87,15 +100,18 @@ function(params) {
           name: tc.config.objectStorageConfig.name,
         } } },
       ],
-      ports: [{ name: 'http', containerPort: tc.service.spec.ports[0].port }],
+      ports: [
+        { name: name, containerPort: tc.config.ports[name] }
+        for name in std.objectFields(tc.config.ports)
+      ],
       livenessProbe: { failureThreshold: 4, periodSeconds: 30, httpGet: {
         scheme: 'HTTP',
-        port: tc.service.spec.ports[0].port,
+        port: tc.config.ports.http,
         path: '/-/healthy',
       } },
       readinessProbe: { failureThreshold: 20, periodSeconds: 5, httpGet: {
         scheme: 'HTTP',
-        port: tc.service.spec.ports[0].port,
+        port: tc.config.ports.http,
         path: '/-/ready',
       } },
       volumeMounts: [{

jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet

@@ -20,6 +20,9 @@ local defaults = {
   logLevel: 'info',
   resources: {},
   serviceMonitor: false,
+  ports: {
+    http: 9090,
+  },
 
   commonLabels:: {
     'app.kubernetes.io/name': 'thanos-query-frontend',
@@ -57,7 +60,17 @@ function(params) {
       },
       spec: {
         selector: tqf.config.podLabelSelector,
-        ports: [{ name: 'http', targetPort: 'http', port: 9090 }],
+        ports: [
+          {
+            assert std.isString(name),
+            assert std.isNumber(tqf.config.ports[name]),
+
+            name: name,
+            port: tqf.config.ports[name],
+            targetPort: tqf.config.ports[name],
+          }
+          for name in std.objectFields(tqf.config.ports)
+        ],
       },
     },
 
@@ -68,7 +81,7 @@ function(params) {
       args: [
         'query-frontend',
         '--query-frontend.compress-responses',
-        '--http-address=0.0.0.0:%d' % tqf.service.spec.ports[0].port,
+        '--http-address=0.0.0.0:%d' % tqf.config.ports.http,
         '--query-frontend.downstream-url=%s' % tqf.config.downstreamURL,
         '--query-range.split-interval=%s' % tqf.config.splitInterval,
         '--query-range.max-retries-per-request=%d' % tqf.config.maxRetries,
@@ -81,15 +94,18 @@ function(params) {
           }),
         ] else []
       ),
-      ports: [{ name: 'http', containerPort: tqf.service.spec.ports[0].port }],
+      ports: [
+        { name: name, containerPort: tqf.config.ports[name] }
+        for name in std.objectFields(tqf.config.ports)
+      ],
       livenessProbe: { failureThreshold: 4, periodSeconds: 30, httpGet: {
         scheme: 'HTTP',
-        port: tqf.service.spec.ports[0].port,
+        port: tqf.config.ports.http,
         path: '/-/healthy',
       } },
       readinessProbe: { failureThreshold: 20, periodSeconds: 5, httpGet: {
         scheme: 'HTTP',
-        port: tqf.service.spec.ports[0].port,
+        port: tqf.config.ports.http,
         path: '/-/ready',
       } },
       resources: if tqf.config.resources != {} then tqf.config.resources else {},

jsonnet/kube-thanos/kube-thanos-query.libsonnet

@@ -64,8 +64,8 @@ function(params) {
             assert std.isNumber(tq.config.ports[name]),
 
             name: name,
-            targetPort: tq.config.ports[name],
             port: tq.config.ports[name],
+            targetPort: tq.config.ports[name],
           }
           for name in std.objectFields(tq.config.ports)
         ],