Merge pull request #67 from rackerlabs/deploy-updates

bootstrap/ingress-nginx/values.yaml

@@ -1,7 +1,2 @@
 controller:
   replicaCount: 1
-  hostPort:
-    enabled: true
-    ports:
-      http: 80
-      https: 443

components/ironic/dnsmasq-cm.yaml

@@ -10,7 +10,7 @@ data:
   # external IP address of Ingress. Used to populate DNS A records for the
   # Understack components
   INGRESS_IP: 192.168.1.177
-  DNS_PORT: '1053'
+  DNS_PORT: '53'
   LOG_DNS_QUERIES: 'true'
   LOG_DHCP_QUERIES: 'true'
   # If you want to print rendered dnsmasq.conf in the logs

components/ironic/dnsmasq-ss.yaml

@@ -1,9 +1,29 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ironic-dnsmasq
+  labels:
+    application: ironic-dnsmasq
+spec:
+  ports:
+  - name: dns
+    port: 53
+    protocol: UDP
+  - name: dhcp
+    port: 67
+    protocol: UDP
+  clusterIP: None
+  selector:
+    application: ironic-dnsmasq
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: ironic-dnsmasq
   namespace: openstack
 spec:
+  serviceName: ironic-dnsmasq
   replicas: 1
   selector:
     matchLabels:
@@ -37,12 +57,12 @@ spec:
             - configMapRef:
                 name: ironic-dnsmasq
           ports:
-            - containerPort: 1053
+            - name: dns
+              containerPort: 53
               protocol: UDP
-              hostPort: 53
-            - containerPort: 1067
+            - name: dhcp
+              containerPort: 67
               protocol: UDP
-              hostPort: 67
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp

containers/dnsmasq/dnsmasq.conf.j2

@@ -15,7 +15,6 @@ bind-interfaces
 
 # DNS port to listen on, set to 0 to disable
 port={{ env.DNS_PORT | default(53) }}
-dhcp-alternate-port=1067,68
 
 {% if env.LOG_DNS_QUERIES | default(False, True) %}
 # enable DNS logging