diff --git a/Dockerfile b/Dockerfile index a6cf30a44494125891090a753f864a1643215baf..9b0ce3142cac095f5de5e4bafa5558bbdbfd12dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,8 @@ # # BASE IMAGE -# UBI 8 is required, openjdk8 is missing a lot that is required ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk8 -ARG BASE_TAG=latest +ARG BASE_TAG=1.8.0 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} # @@ -25,14 +24,13 @@ COPY puppetserver-6.13.0-1.el8.noarch.rpm \ dumb-init-1.2.2-6.el8.x86_64.rpm /opt/ COPY *.gem /opt/ - +USER root RUN yum update -y && \ yum -y upgrade RUN yum -y install java-1.8.0-openjdk-headless net-tools procps && rpm -Uvh /opt/puppet*.rpm - ENV PUPPETSERVER_JAVA_ARGS="-Xms512m -Xmx512m" \ PATH=/opt/puppetlabs/server/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:$PATH \ SSLDIR=/etc/puppetlabs/puppet/ssl \ diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 3a0b91452de57147291e7da7d465a941d935f660..cf436c2ee4dd201a66ff441a03496b9a1737c9f1 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: puppetserver -version: 5.0.1 -appVersion: 6.12.1 +version: latest +appVersion: 6.13.0 description: Puppet automates the delivery and operation of software. keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"] home: https://puppet.com/ diff --git a/helm/requirements.yaml b/helm/requirements.yaml index 00c75d138e9afeeb9f2f28db8f06d828fcecf387..95cdf7fe294ab94db09432e724672cc9e21f90aa 100644 --- a/helm/requirements.yaml +++ b/helm/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - - name: postgresql - version: "9.4.*" - repository: https://charts.bitnami.com/bitnami + - name: postgresql96 + version: "latest" + repository: https://registry1.dsop.io/ironbank/opensource/postgres/postgresql96 condition: postgresql.enabled diff --git a/helm/values.yaml b/helm/values.yaml index 677c8120118f5fb3bab13972f2945e0686ee8d49..f98ffd38f299533152e0c978405fc91c090f5104 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -6,8 +6,8 @@ ## puppetserver: name: puppetserver - image: puppet/puppetserver - tag: 6.12.1 + image: registry1.dsop.io/ironbank/puppet-labs/puppetserver + tag: 6.13.0 pullPolicy: IfNotPresent ## Mandatory Deployment of Puppet Server Master/s ## @@ -264,90 +264,90 @@ puppetserver: ## r10k Repo Configuration ## -r10k: - name: r10k - image: puppet/r10k - tag: 3.5.2 - pullPolicy: IfNotPresent - code: - resources: {} - # requests: - # memory: 256Mi - # cpu: 200m - # limits: - # memory: 512Mi - # cpu: 300m - cronJob: - schedule: "*/5 * * * *" - ## Additional r10k code container arguments - extraArgs: {} - # - --verbose=debug2 # error, warn, notice, info, debug, debug1, debug2 - # - --trace - # - --color - ## Additional r10k code container environment variables - extraEnv: {} - viaSsh: - credentials: - ssh: - ## A multi-line string - value: # | - # PRIV_KEY CONTENTS - known_hosts: - ## A multi-line string - value: # | - # KNOWN_HOSTS CONTENTS - ## or set the r10k known hosts file and SSH Private Key - ## from a pre-existing K8s secret - ## NOTE: Using this secret supercedes all other credentials settings. - existingSecret: "" - hiera: - resources: {} - # requests: - # memory: 256Mi - # cpu: 200m - # limits: - # memory: 512Mi - # cpu: 300m - cronJob: - schedule: "*/4 * * * *" - ## Additional r10k hiera container environment variables - extraArgs: {} - # - --verbose=debug2 # error, warn, notice, info, debug, debug1, debug2 - # - --trace - # - --color - ## Additional puppetserver hiera container environment variables - extraEnv: {} - viaSsh: - credentials: - ssh: - ## A multi-line string - value: # | - # PRIV_KEY CONTENTS - known_hosts: - ## A multi-line string - value: # | - # KNOWN_HOSTS CONTENTS - ## or set the r10k known hosts file and SSH Private Key - ## from a pre-existing K8s secret - ## NOTE: Using this secret supercedes all other credentials settings. - existingSecret: "" - -## PuppetDB Configuration -## -puppetdb: - name: puppetdb - image: puppet/puppetdb - tag: 6.12.0 - pullPolicy: IfNotPresent - resources: {} - # requests: - # memory: 512Mi - # cpu: 500m - # limits: - # memory: 1024Mi - # cpu: 1000m - ## Additional puppetdb container environment variables - extraEnv: {} +#r10k: +# name: r10k +# image: puppet/r10k +# tag: 3.5.2 +# pullPolicy: IfNotPresent +# code: +# resources: {} +# # requests: +# # memory: 256Mi +# # cpu: 200m +# # limits: +# # memory: 512Mi +# # cpu: 300m +# cronJob: +# schedule: "*/5 * * * *" +# ## Additional r10k code container arguments +# extraArgs: {} +# # - --verbose=debug2 # error, warn, notice, info, debug, debug1, debug2 +# # - --trace +# # - --color +# ## Additional r10k code container environment variables +# extraEnv: {} +# viaSsh: +# credentials: +# ssh: +# ## A multi-line string +# value: # | +# # PRIV_KEY CONTENTS +# known_hosts: +# ## A multi-line string +# value: # | +# # KNOWN_HOSTS CONTENTS +# ## or set the r10k known hosts file and SSH Private Key +# ## from a pre-existing K8s secret +# ## NOTE: Using this secret supercedes all other credentials settings. +# existingSecret: "" +# hiera: +# resources: {} +# # requests: +# # memory: 256Mi +# # cpu: 200m +# # limits: +# # memory: 512Mi +# # cpu: 300m +# cronJob: +# schedule: "*/4 * * * *" +# ## Additional r10k hiera container environment variables +# extraArgs: {} +# # - --verbose=debug2 # error, warn, notice, info, debug, debug1, debug2 +# # - --trace +# # - --color +# ## Additional puppetserver hiera container environment variables +# extraEnv: {} +# viaSsh: +# credentials: +# ssh: +# ## A multi-line string +# value: # | +# # PRIV_KEY CONTENTS +# known_hosts: +# ## A multi-line string +# value: # | +# # KNOWN_HOSTS CONTENTS +# ## or set the r10k known hosts file and SSH Private Key +# ## from a pre-existing K8s secret +# ## NOTE: Using this secret supercedes all other credentials settings. +# existingSecret: "" +# +### PuppetDB Configuration +### +#puppetdb: +# name: puppetdb +# image: puppet/puppetdb +# tag: 6.12.0 +# pullPolicy: IfNotPresent +# resources: {} +# # requests: +# # memory: 512Mi +# # cpu: 500m +# # limits: +# # memory: 1024Mi +# # cpu: 1000m +# ## Additional puppetdb container environment variables +# extraEnv: {} ## PostgreSQL Sub-Chart Configuration ## Please check: https://github.com/bitnami/charts/tree/master/bitnami/postgresql @@ -406,50 +406,50 @@ postgresql: ## Puppetboard Configuration ## -puppetboard: - enabled: false - name: puppetboard - image: xtigyro/puppetboard - tag: 2.2.0 - pullPolicy: IfNotPresent - resources: {} - # requests: - # memory: 368Mi - # cpu: 300m - # limits: - # memory: 640Mi - # cpu: 500m - ## Additional puppetboard container environment variables - ## - extraEnv: {} - # ENABLE_CATALOG: True - # ENABLE_QUERY: True - # INVENTORY_FACTS: Hostname,fqdn,IP Address,ipaddress - # GRAPH_FACTS: architecture,puppetversion,osfamily - ingress: - ## If true, Puppetboard Ingress will be created - ## - enabled: false - ## Puppetboard Ingress annotations - ## - annotations: {} - # kubernetes.io/ingress.class: nginx - ## Puppetboard Ingress additional labels - ## - extraLabels: {} - ## Puppetboard Ingress hostnames with optional path - ## Must be provided if Ingress is enabled - ## - hosts: [] - # - puppetboard.domain.com - # - domain.com/puppetboard - ## Puppetboard Ingress TLS configuration - ## Secrets must be manually created in the namespace - ## - tls: [] - # - secretName: puppetboard-server-tls - # hosts: - # - puppetboard.domain.com +#puppetboard: +# enabled: false +# name: puppetboard +# image: xtigyro/puppetboard +# tag: 2.2.0 +# pullPolicy: IfNotPresent +# resources: {} +# # requests: +# # memory: 368Mi +# # cpu: 300m +# # limits: +# # memory: 640Mi +# # cpu: 500m +# ## Additional puppetboard container environment variables +# ## +# extraEnv: {} +# # ENABLE_CATALOG: True +# # ENABLE_QUERY: True +# # INVENTORY_FACTS: Hostname,fqdn,IP Address,ipaddress +# # GRAPH_FACTS: architecture,puppetversion,osfamily +# ingress: +# ## If true, Puppetboard Ingress will be created +# ## +# enabled: false +# ## Puppetboard Ingress annotations +# ## +# annotations: {} +# # kubernetes.io/ingress.class: nginx +# ## Puppetboard Ingress additional labels +# ## +# extraLabels: {} +# ## Puppetboard Ingress hostnames with optional path +# ## Must be provided if Ingress is enabled +# ## +# hosts: [] +# # - puppetboard.domain.com +# # - domain.com/puppetboard +# ## Puppetboard Ingress TLS configuration +# ## Secrets must be manually created in the namespace +# ## +# tls: [] +# # - secretName: puppetboard-server-tls +# # hosts: +# # - puppetboard.domain.com ## Hiera Configuration for Puppet Server ##