fix: update service names and references
ci/woodpecker/pr/pre-commit Pipeline was successful
ci/woodpecker/pr/kubeconform Pipeline was successful

updating all the names of services and their respective filenames to
better match the way puppet infra is used in my lab.

- puppet -> the compilers
- puppetca -> the master(s)
- puppetdb -> the puppetdb
- puppetboard -> puppetboard

updated references to these services in all other definitions I could find

note: need a good way to test these changes with argocd
This commit is contained in:
2026-03-18 11:59:57 +11:00
parent df1b9a5685
commit 9a72059a62
13 changed files with 21 additions and 21 deletions
@@ -11,7 +11,7 @@ metadata:
namespace: puppet namespace: puppet
data: data:
OPENVOXSERVER_PORT: "8140" OPENVOXSERVER_PORT: "8140"
DNS_ALT_NAMES: "puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppetserver-compiler,puppet,puppet.k8s.syd1.au.unkin.net" DNS_ALT_NAMES: "puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppet,puppet.k8s.syd1.au.unkin.net"
OPENVOXDB_SERVER_URLS: "https://puppetdb:8081" OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
CA_ENABLED: "false" CA_ENABLED: "false"
CA_HOSTNAME: "puppetca" CA_HOSTNAME: "puppetca"
@@ -12,7 +12,7 @@ metadata:
data: data:
OPENVOXSERVER_HOSTNAME: "puppet" OPENVOXSERVER_HOSTNAME: "puppet"
OPENVOXSERVER_PORT: "8140" OPENVOXSERVER_PORT: "8140"
DNS_ALT_NAMES: "puppet,puppetserver-agents-to-puppet,puppetca,puppet-compilers,puppetca.k8s.syd1.au.unkin.net,puppet.k8s.syd1.au.unkin.net" DNS_ALT_NAMES: "puppet,puppetserver-agents-to-puppet,puppetca,puppet-headless,puppetca.k8s.syd1.au.unkin.net,puppet.k8s.syd1.au.unkin.net"
OPENVOXDB_SERVER_URLS: "https://puppetdb:8081" OPENVOXDB_SERVER_URLS: "https://puppetdb:8081"
CA_ALLOW_SUBJECT_ALT_NAMES: "true" CA_ALLOW_SUBJECT_ALT_NAMES: "true"
PUPPETSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" PUPPETSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+1 -1
View File
@@ -126,7 +126,7 @@ spec:
- -c - -c
- | - |
echo 'Waiting for puppetserver to become ready...' echo 'Waiting for puppetserver to become ready...'
until printf "." && curl --silent --fail --insecure 'https://puppetserver-puppet:8140/status/v1/simple' | grep -q '^running$'; do until printf "." && curl --silent --fail --insecure 'https://puppetca:8140/status/v1/simple' | grep -q '^running$'; do
sleep 2; sleep 2;
done; done;
echo 'Puppetserver OK ✓' echo 'Puppetserver OK ✓'
@@ -12,7 +12,7 @@ metadata:
app.kubernetes.io/instance: puppetserver app.kubernetes.io/instance: puppetserver
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 8.8.0 app.kubernetes.io/version: 8.8.0
name: puppetserver-compiler name: puppet
namespace: puppet namespace: puppet
spec: spec:
rules: rules:
@@ -21,7 +21,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: puppetserver-compiler name: puppet
port: port:
number: 8140 number: 8140
path: / path: /
+1 -1
View File
@@ -14,7 +14,7 @@ metadata:
app.kubernetes.io/instance: puppetserver app.kubernetes.io/instance: puppetserver
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 8.8.0 app.kubernetes.io/version: 8.8.0
name: puppetserver-puppetboard name: puppetboard
namespace: puppet namespace: puppet
spec: spec:
rules: rules:
@@ -12,7 +12,7 @@ metadata:
app.kubernetes.io/instance: puppetserver app.kubernetes.io/instance: puppetserver
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 8.8.0 app.kubernetes.io/version: 8.8.0
name: puppetserver-masters name: puppetca
namespace: puppet namespace: puppet
spec: spec:
rules: rules:
@@ -21,7 +21,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: puppetserver-puppet name: puppetca
port: port:
number: 8140 number: 8140
path: / path: /
+7 -7
View File
@@ -25,12 +25,12 @@ resources:
- horizontalpodautoscaler_puppetserver-puppetdb-autoscaler.yaml - horizontalpodautoscaler_puppetserver-puppetdb-autoscaler.yaml
- ingress_puppetboard.yaml - ingress_puppetboard.yaml
- ingress_puppetdb.yaml - ingress_puppetdb.yaml
- ingress_puppetserver-compilers.yaml - ingress_puppet.yaml
- ingress_puppetserver-masters.yaml - ingress_puppetca.yaml
- service_puppetserver-agents-to-puppet.yaml - service_puppetserver-agents-to-puppet.yaml
- service_puppetserver-puppet-compilers-headless.yaml - service_puppet-headless.yaml
- service_puppetserver-puppet-compilers.yaml - service_puppet.yaml
- service_puppetserver-puppet.yaml - service_puppetca.yaml
- service_puppetserver-puppetboard.yaml - service_puppetboard.yaml
- service_puppetserver-puppetdb.yaml - service_puppetdb.yaml
- statefulset_puppetserver-compiler.yaml - statefulset_puppetserver-compiler.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: puppetserver app.kubernetes.io/instance: puppetserver
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 8.8.0 app.kubernetes.io/version: 8.8.0
name: puppetserver-compiler-headless name: puppet-headless
namespace: puppet namespace: puppet
spec: spec:
clusterIP: None clusterIP: None
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: puppetserver app.kubernetes.io/instance: puppetserver
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 8.8.0 app.kubernetes.io/version: 8.8.0
name: puppetserver-compiler name: puppet
namespace: puppet namespace: puppet
spec: spec:
ports: ports:
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
app.kubernetes.io/component: puppetserver app.kubernetes.io/component: puppetserver-master
app.kubernetes.io/instance: puppetserver app.kubernetes.io/instance: puppetserver
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 8.8.0 app.kubernetes.io/version: 8.8.0
@@ -13,6 +13,6 @@ spec:
- name: puppetserver - name: puppetserver
port: 8140 port: 8140
selector: selector:
app.kubernetes.io/component: puppetserver app.kubernetes.io/component: puppetserver-master
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
type: ClusterIP type: ClusterIP
@@ -16,7 +16,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/component: puppetserver-compilers app.kubernetes.io/component: puppetserver-compilers
app.kubernetes.io/name: puppetserver app.kubernetes.io/name: puppetserver
serviceName: puppet-compilers-headless serviceName: puppet-headless
template: template:
metadata: metadata:
labels: labels:
@@ -49,7 +49,7 @@ spec:
- name: OPENVOXSERVER_PORT - name: OPENVOXSERVER_PORT
value: "8140" value: "8140"
- name: DNS_ALT_NAMES - name: DNS_ALT_NAMES
value: puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppet-compilers,puppet,puppet.k8s.syd1.au.unkin.net value: puppetserver-compiler-0,puppetserver-compiler-1,puppetserver-compiler-2,puppetserver-compiler-3,puppetserver-compiler-4,puppet-headless,puppet,puppet.k8s.syd1.au.unkin.net
- name: OPENVOXDB_SERVER_URLS - name: OPENVOXDB_SERVER_URLS
value: https://puppetdb:8081 value: https://puppetdb:8081
- name: CA_ENABLED - name: CA_ENABLED