refactor: Standardize ports and ingress hosts

Author: pojntfx

README.md

@@ -66,7 +66,7 @@ Usage:
 
 Flags:
   -f, --dhcpdd.configFile string       Configuration file to use.
-  -l, --dhcpdd.listenHostPort string   TCP listen host:port. (default "localhost:1240")
+  -l, --dhcpdd.listenHostPort string   TCP listen host:port. (default "localhost:1020")
   -h, --help                           help for dhcpdd
 ```
 
@@ -86,7 +86,7 @@ Usage:
 
 Flags:
   -f, --dhclientd.configFile string       Configuration file to use.
-  -l, --dhclientd.listenHostPort string   TCP listen host:port. (default "localhost:1241")
+  -l, --dhclientd.listenHostPort string   TCP listen host:port. (default "localhost:1030")
   -h, --help                              help for dhclientd
 ```
 

charts/dhclientd/templates/stack.yaml

@@ -42,7 +42,7 @@ spec:
               cpu: {{ .Values.resources.cpu }}
           {{ end }}
           ports:
-            - containerPort: 1241
+            - containerPort: 1030
             {{ if and .Values.meta.dev .Values.meta.debug }}
             - containerPort: {{ .Values.meta.debugPort }}
             {{end}}
@@ -59,8 +59,8 @@ spec:
   type: NodePort
   ports:
     - name: grpc
-      port: 1241
-      targetPort: 1241
+      port: 1030
+      targetPort: 1030
       nodePort: {{ .Values.ingress.nodePort }}
     - name: debug
       port: {{ .Values.meta.debugNodePort }}
@@ -96,8 +96,8 @@ spec:
     app: dhclientd-{{ .Release.Name }}
   ports:
     - name: grpc
-      port: 1241
-      targetPort: 1241
+      port: 1030
+      targetPort: 1030
 
 ---
 apiVersion: networking.k8s.io/v1beta1

charts/dhclientd/values.yaml

@@ -14,6 +14,6 @@ resources:
   maxReplicas: 10
 
 ingress:
-  nodePort: 31241
-  domain: dhclientd.felix.pojtinger.com
+  nodePort: 31030
+  domain: dhclientd.example.com
   path: /

charts/dhcpdd/templates/stack.yaml

@@ -42,7 +42,7 @@ spec:
               cpu: {{ .Values.resources.cpu }}
           {{ end }}
           ports:
-            - containerPort: 1240
+            - containerPort: 1020
             {{ if and .Values.meta.dev .Values.meta.debug }}
             - containerPort: {{ .Values.meta.debugPort }}
             {{end}}
@@ -59,8 +59,8 @@ spec:
   type: NodePort
   ports:
     - name: grpc
-      port: 1240
-      targetPort: 1240
+      port: 1020
+      targetPort: 1020
       nodePort: {{ .Values.ingress.nodePort }}
     - name: debug
       port: {{ .Values.meta.debugNodePort }}
@@ -96,8 +96,8 @@ spec:
     app: dhcpdd-{{ .Release.Name }}
   ports:
     - name: grpc
-      port: 1240
-      targetPort: 1240
+      port: 1020
+      targetPort: 1020
 
 ---
 apiVersion: networking.k8s.io/v1beta1

charts/dhcpdd/values.yaml

@@ -14,6 +14,6 @@ resources:
   maxReplicas: 10
 
 ingress:
-  nodePort: 31240
-  domain: dhcpdd.felix.pojtinger.com
+  nodePort: 31020
+  domain: dhcpdd.example.com
   path: /

cmd/constants.go

@@ -1,8 +1,8 @@
 package cmd
 
 const (
-	DHCPDDHostPortDefault    = "localhost:1240"                  // DHCPDDHostPortDefault is the default Host:port of `dhcpdd`.
-	DHClientDHostPortDefault = "localhost:1241"                  // DHClientDHostPortDefault is the default Host:port of `dhclient`.
+	DHCPDDHostPortDefault    = "localhost:1020"                  // DHCPDDHostPortDefault is the default Host:port of `dhcpdd`.
+	DHClientDHostPortDefault = "localhost:1030"                  // DHClientDHostPortDefault is the default Host:port of `dhclient`.
 	HostPortDocs             = "Host:port of the server to use." // HostPortDocs is the documentation for the host:port flag.
 	ConfigurationFileDocs    = "Configuration file to use."      // ConfigurationFileDocs is the documentation for the configuration file flag.)
 )

examples/dhclientd.yaml

@@ -1,2 +1,2 @@
 dhclientd:
-  listenHostPort: localhost:1241
+  listenHostPort: localhost:1030

examples/dhcpdd.yaml

@@ -1,2 +1,2 @@
 dhcpdd:
-  listenHostPort: localhost:1240
+  listenHostPort: localhost:1020