puppet: use OPENVOXSERVER_JAVA_ARGS for puppetserver JVM args (#451)
## Why The `ghcr.io/openvoxproject/openvoxserver` image reads `OPENVOXSERVER_JAVA_ARGS` (`/etc/default/puppetserver`: `JAVA_ARGS=$OPENVOXSERVER_JAVA_ARGS`) and ships no `PUPPETSERVER_*` alias, so our heap/JMX flags have been inert since the fork switch — live masters and compilers run the image default `-Xms1024m -Xmx1024m` with no JMX. ## How - Rename `PUPPETSERVER_JAVA_ARGS` to `OPENVOXSERVER_JAVA_ARGS` in `puppetserver-master-config`, `puppetserver-compiler-config` and `puppetserver-init-config`. - Rename the same var on the `perms-and-dirs` init container in `deployment_puppetserver-compiler.yaml`. - Flag values are unchanged (`-Xms1024m -Xmx3072m` plus the JMX flags); heap tuning is a separate call. Reviewed-on: #451 Co-authored-by: unkin-agent <unkin-agent@unkin.net> Co-committed-by: unkin-agent <unkin-agent@unkin.net>
This commit was merged in pull request #451.
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user