From e86cd7a6ae756b5677a1920db100f0d5c08306ae Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Wed, 18 Mar 2026 15:07:25 +1100 Subject: [PATCH] feat: ensure puppet is available externally (#35) - change puppet/puppetca -> LoadBalancer - dedicate ip's for puppet and puppetca loadbalancers - name the puppetserver port - remove puppet/puppetca ingress Reviewed-on: https://git.unkin.net/unkin/argocd-apps/pulls/35 --- .../deployment_puppetserver-master.yaml | 1 + apps/base/puppet/ingress_puppet.yaml | 28 ------------------- apps/base/puppet/ingress_puppetca.yaml | 28 ------------------- apps/base/puppet/kustomization.yaml | 2 -- apps/base/puppet/service_puppet.yaml | 6 +++- apps/base/puppet/service_puppetca.yaml | 6 +++- .../statefulset_puppetserver-compiler.yaml | 1 + 7 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 apps/base/puppet/ingress_puppet.yaml delete mode 100644 apps/base/puppet/ingress_puppetca.yaml diff --git a/apps/base/puppet/deployment_puppetserver-master.yaml b/apps/base/puppet/deployment_puppetserver-master.yaml index dc1089a..d86080b 100644 --- a/apps/base/puppet/deployment_puppetserver-master.yaml +++ b/apps/base/puppet/deployment_puppetserver-master.yaml @@ -42,6 +42,7 @@ spec: memory: 1024Mi ports: - containerPort: 8140 + name: puppetserver envFrom: - configMapRef: name: puppetserver-master-config diff --git a/apps/base/puppet/ingress_puppet.yaml b/apps/base/puppet/ingress_puppet.yaml deleted file mode 100644 index 81af398..0000000 --- a/apps/base/puppet/ingress_puppet.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - external-dns.alpha.kubernetes.io/hostname: puppet.k8s.syd1.au.unkin.net - external-dns.alpha.kubernetes.io/target: 198.18.200.0 - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/proxy-read-timeout: "600" - nginx.ingress.kubernetes.io/ssl-passthrough: "true" - labels: - app.kubernetes.io/component: puppetserver - app.kubernetes.io/instance: puppetserver - app.kubernetes.io/name: puppetserver - app.kubernetes.io/version: 8.8.0 - name: puppet - namespace: puppet -spec: - rules: - - host: puppet.k8s.syd1.au.unkin.net - http: - paths: - - backend: - service: - name: puppet - port: - number: 8140 - path: / - pathType: ImplementationSpecific diff --git a/apps/base/puppet/ingress_puppetca.yaml b/apps/base/puppet/ingress_puppetca.yaml deleted file mode 100644 index 02ccf3c..0000000 --- a/apps/base/puppet/ingress_puppetca.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - external-dns.alpha.kubernetes.io/hostname: puppetca.k8s.syd1.au.unkin.net - external-dns.alpha.kubernetes.io/target: 198.18.200.0 - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/proxy-read-timeout: "600" - nginx.ingress.kubernetes.io/ssl-passthrough: "true" - labels: - app.kubernetes.io/component: puppetserver - app.kubernetes.io/instance: puppetserver - app.kubernetes.io/name: puppetserver - app.kubernetes.io/version: 8.8.0 - name: puppetca - namespace: puppet -spec: - rules: - - host: puppetca.k8s.syd1.au.unkin.net - http: - paths: - - backend: - service: - name: puppetca - port: - number: 8140 - path: / - pathType: ImplementationSpecific diff --git a/apps/base/puppet/kustomization.yaml b/apps/base/puppet/kustomization.yaml index 353e9f6..b169986 100644 --- a/apps/base/puppet/kustomization.yaml +++ b/apps/base/puppet/kustomization.yaml @@ -25,8 +25,6 @@ resources: - horizontalpodautoscaler_puppetserver-puppetdb-autoscaler.yaml - ingress_puppetboard.yaml - ingress_puppetdb.yaml - - ingress_puppet.yaml - - ingress_puppetca.yaml - service_puppetserver-agents-to-puppet.yaml - service_puppet-headless.yaml - service_puppet.yaml diff --git a/apps/base/puppet/service_puppet.yaml b/apps/base/puppet/service_puppet.yaml index 6ac0719..113d96e 100644 --- a/apps/base/puppet/service_puppet.yaml +++ b/apps/base/puppet/service_puppet.yaml @@ -2,6 +2,10 @@ apiVersion: v1 kind: Service metadata: labels: + external-dns.alpha.kubernetes.io/hostname: puppet.k8s.syd1.au.unkin.net + external-dns.alpha.kubernetes.io/target: 198.18.200.3 + purelb.io/addresses: 198.18.200.3 + purelb.io/service-group: common app.kubernetes.io/component: puppetserver-compilers app.kubernetes.io/instance: puppetserver app.kubernetes.io/name: puppetserver @@ -15,4 +19,4 @@ spec: selector: app.kubernetes.io/component: puppetserver-compilers app.kubernetes.io/name: puppetserver - type: ClusterIP + type: LoadBalancer diff --git a/apps/base/puppet/service_puppetca.yaml b/apps/base/puppet/service_puppetca.yaml index f62d4fc..a8f65fc 100644 --- a/apps/base/puppet/service_puppetca.yaml +++ b/apps/base/puppet/service_puppetca.yaml @@ -2,6 +2,10 @@ apiVersion: v1 kind: Service metadata: labels: + external-dns.alpha.kubernetes.io/hostname: puppetca.k8s.syd1.au.unkin.net + external-dns.alpha.kubernetes.io/target: 198.18.200.2 + purelb.io/addresses: 198.18.200.2 + purelb.io/service-group: common app.kubernetes.io/component: puppetserver-master app.kubernetes.io/instance: puppetserver app.kubernetes.io/name: puppetserver @@ -15,4 +19,4 @@ spec: selector: app.kubernetes.io/component: puppetserver app.kubernetes.io/name: puppetserver - type: ClusterIP + type: LoadBalancer diff --git a/apps/base/puppet/statefulset_puppetserver-compiler.yaml b/apps/base/puppet/statefulset_puppetserver-compiler.yaml index d378eae..38824e6 100644 --- a/apps/base/puppet/statefulset_puppetserver-compiler.yaml +++ b/apps/base/puppet/statefulset_puppetserver-compiler.yaml @@ -40,6 +40,7 @@ spec: memory: 1024Mi ports: - containerPort: 8140 + name: puppetserver envFrom: null env: - name: OPENVOXSERVER_HOSTNAME