diff --git a/charts/confluence-server/Chart.yaml b/charts/confluence-server/Chart.yaml index f4d0c569..0288df96 100644 --- a/charts/confluence-server/Chart.yaml +++ b/charts/confluence-server/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: confluence-server -version: 1.3.2 -appVersion: 7.3.1 +version: 1.4.0 +appVersion: 7.3.2 description: Atlassian Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence - where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence. keywords: - confluence diff --git a/charts/confluence-server/README.md b/charts/confluence-server/README.md index cf0e9348..c25fd776 100644 --- a/charts/confluence-server/README.md +++ b/charts/confluence-server/README.md @@ -45,7 +45,7 @@ The following table lists the configurable parameters of the _Confluence Server_ | Parameter | Description | Default | | ---------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------- | | `image.repository` | Docker repository to use | `atlassian/confluence-server` | -| `image.tag` | Docker tag to use | `7.3.1` | +| `image.tag` | Docker tag to use | `7.3.2` | | `image.pullPolicy` | Docker image pull policy | `IfNotPresent` | | `nameOverride` | String to partially override `confluence-server.fullname` template (will prepend the release name) | `nil` | | `fullnameOverride` | String to fully override `confluence-server.fullname` template | `nil` | diff --git a/charts/confluence-server/values.yaml b/charts/confluence-server/values.yaml index ba14a98a..281a0154 100644 --- a/charts/confluence-server/values.yaml +++ b/charts/confluence-server/values.yaml @@ -1,6 +1,6 @@ image: repository: atlassian/confluence-server - tag: 7.3.1 + tag: 7.3.2 pullPolicy: IfNotPresent nameOverride: "" diff --git a/charts/nexus3/Chart.yaml b/charts/nexus3/Chart.yaml index 4f54f423..68037d83 100644 --- a/charts/nexus3/Chart.yaml +++ b/charts/nexus3/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nexus3 -version: 1.3.0 +version: 1.3.1 appVersion: 3.21.1 description: Sonatype Nexus OSS is an open source repository manager keywords: diff --git a/charts/nexus3/README.md b/charts/nexus3/README.md index 33ba67b6..99165420 100644 --- a/charts/nexus3/README.md +++ b/charts/nexus3/README.md @@ -74,6 +74,7 @@ The following table lists the configurable parameters of the _Nexus3_ chart and | `ingress.path` | Path for ingress rules | `/` | | `ingress.hosts` | List of ingress hosts | `[]` | | `ingress.tls` | List of TLS configurations (`ingress.tls[n].secretName`, `ingress.tls[n].hosts[m])` | `[]` | +| `properties` | List of properties to start _Nexus3_ with. | `nil` | | `config.enabled` | Automatically configure _Nexus3_ | `false` | ## Persistence diff --git a/charts/nexus3/templates/configmap.yaml b/charts/nexus3/templates/config.yaml similarity index 100% rename from charts/nexus3/templates/configmap.yaml rename to charts/nexus3/templates/config.yaml diff --git a/charts/nexus3/templates/deployment.yaml b/charts/nexus3/templates/deployment.yaml index 703297c9..97cc8f77 100644 --- a/charts/nexus3/templates/deployment.yaml +++ b/charts/nexus3/templates/deployment.yaml @@ -21,7 +21,8 @@ spec: app.kubernetes.io/name: {{ include "nexus3.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + checksum/properties: {{ include (print $.Template.BasePath "/properties.yaml") . | sha256sum }} + checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- with .Values.podAnnotations }} {{- . | toYaml | trim | nindent 8 }} {{- end }} @@ -85,6 +86,12 @@ spec: - mountPath: /nexus-data name: {{ include "nexus3.pvcname" . }} {{- if .Values.config.enabled }} + - mountPath: /nexus-data/etc/nexus.properties + name: {{ template "nexus3.fullname" . }}-conf + subPath: nexus.properties + readonly: true + {{- end }} + {{- if .Values.config.enabled }} - mountPath: /opt/sonatype/nexus/conf name: {{ template "nexus3.fullname" . }}-conf readonly: true @@ -94,15 +101,13 @@ spec: subPath: {{ .Values.config.rootPassword.key }} readonly: true {{- end }} - {{- if .Values.config.ldap }} - {{- if .Values.config.ldap.password }} + {{- if and .Values.config.ldap .Values.config.ldap.password }} - mountPath: /opt/sonatype/nexus/secret/ldap.password name: {{ .Values.config.ldap.password.secret }} subPath: {{ .Values.config.ldap.password.key }} readonly: true {{- end }} {{- end }} - {{- end }} env: - name: INSTALL4J_ADD_VM_PARAMS {{- if .Values.caCerts }} @@ -132,6 +137,12 @@ spec: secret: secretName: {{ .Values.caCerts.secret }} {{- end }} + {{- if .Values.properties }} + - name: {{ template "nexus3.fullname" . }}-properties + configMap: + name: {{ template "nexus3.fullname" . }}-properties + defaultMode: 0755 + {{- end }} {{- if .Values.config.enabled }} - name: {{ template "nexus3.fullname" . }}-conf configMap: @@ -142,14 +153,12 @@ spec: secret: secretName: {{ .Values.config.rootPassword.secret }} {{- end }} - {{- if .Values.config.ldap }} - {{- if .Values.config.ldap.password }} + {{- if and .Values.config.ldap .Values.config.ldap.password }} - name: {{ .Values.config.ldap.password.secret }} secret: secretName: {{ .Values.config.ldap.password.secret }} {{- end }} {{- end }} - {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- . | toYaml | trim | nindent 8 }} diff --git a/charts/nexus3/templates/properties.yaml b/charts/nexus3/templates/properties.yaml new file mode 100644 index 00000000..8dcca1b3 --- /dev/null +++ b/charts/nexus3/templates/properties.yaml @@ -0,0 +1,16 @@ +{{- if .Values.properties -}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "nexus3.fullname" . }}-properties + labels: + app.kubernetes.io/name: {{ include "nexus3.name" . }} + helm.sh/chart: {{ include "nexus3.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +data: + nexus.properties: | + {{- range .Values.properties }} + {{ . }} + {{- end }} +{{- end }} diff --git a/charts/nexus3/values.yaml b/charts/nexus3/values.yaml index 88da8678..cf954493 100644 --- a/charts/nexus3/values.yaml +++ b/charts/nexus3/values.yaml @@ -70,6 +70,9 @@ ingress: # - nexus-docker.local # - nexus-docker-hosted.local +# properties: +# - nexus.golang.hosted=true + config: enabled: false # rootPassword: