From 902990b55986508789387992a845956efc5340bc Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 5 Sep 2026 11:25:09 +1000 Subject: [PATCH] puppet: use OPENVOXSERVER_JAVA_ARGS for puppetserver JVM args The openvoxserver image reads OPENVOXSERVER_JAVA_ARGS; PUPPETSERVER_JAVA_ARGS has no back-compat alias so the heap and JMX flags were inert. --- apps/base/puppet/configmap_puppetserver-compiler-config.yaml | 2 +- apps/base/puppet/configmap_puppetserver-init-config.yaml | 2 +- apps/base/puppet/configmap_puppetserver-master-config.yaml | 2 +- apps/base/puppet/deployment_puppetserver-compiler.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/base/puppet/configmap_puppetserver-compiler-config.yaml b/apps/base/puppet/configmap_puppetserver-compiler-config.yaml index 5db6dd9..c7f5b08 100644 --- a/apps/base/puppet/configmap_puppetserver-compiler-config.yaml +++ b/apps/base/puppet/configmap_puppetserver-compiler-config.yaml @@ -17,4 +17,4 @@ data: CA_ENABLED: "false" CA_HOSTNAME: "puppetca" CA_PORT: "8140" - PUPPETSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" + OPENVOXSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" diff --git a/apps/base/puppet/configmap_puppetserver-init-config.yaml b/apps/base/puppet/configmap_puppetserver-init-config.yaml index b93aea8..033070c 100644 --- a/apps/base/puppet/configmap_puppetserver-init-config.yaml +++ b/apps/base/puppet/configmap_puppetserver-init-config.yaml @@ -12,4 +12,4 @@ metadata: data: PUPPET_DATA_DIR: "/etc/puppetlabs/code/environments" PUPPET_SSL_DIR: "/etc/puppetlabs/puppet/ssl/certs" - PUPPETSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" + OPENVOXSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" diff --git a/apps/base/puppet/configmap_puppetserver-master-config.yaml b/apps/base/puppet/configmap_puppetserver-master-config.yaml index 346c109..db545ba 100644 --- a/apps/base/puppet/configmap_puppetserver-master-config.yaml +++ b/apps/base/puppet/configmap_puppetserver-master-config.yaml @@ -16,4 +16,4 @@ data: 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" 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" + OPENVOXSERVER_JAVA_ARGS: "-Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" diff --git a/apps/base/puppet/deployment_puppetserver-compiler.yaml b/apps/base/puppet/deployment_puppetserver-compiler.yaml index a7b5380..f0d23d2 100644 --- a/apps/base/puppet/deployment_puppetserver-compiler.yaml +++ b/apps/base/puppet/deployment_puppetserver-compiler.yaml @@ -143,7 +143,7 @@ spec: touch /opt/puppetlabs/server/data/puppetserver/dropsonde/bin/dropsonde chown puppet:puppet -R /opt/puppetlabs/server/data/puppetserver/ env: - - name: PUPPETSERVER_JAVA_ARGS + - name: OPENVOXSERVER_JAVA_ARGS value: -Xms1024m -Xmx3072m -Dcom.sun.management.jmxremote.port=31000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false resources: limits: -- 2.47.3