From f965897bd745fc59c721ca54cfdcfcf675662c24 Mon Sep 17 00:00:00 2001 From: bianchi2 Date: Sun, 21 Jul 2024 00:05:34 +0000 Subject: [PATCH] Update appVersions for DC apps --- src/main/charts/bamboo-agent/Chart.yaml | 2 +- src/main/charts/bamboo-agent/README.md | 2 +- src/main/charts/bamboo/Chart.yaml | 2 +- src/main/charts/bamboo/README.md | 4 ++-- src/main/charts/confluence/README.md | 2 +- src/main/charts/jira/README.md | 2 +- .../bamboo-agent/output.yaml | 8 +++---- .../expected_helm_output/bamboo/output.yaml | 22 +++++++++---------- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/charts/bamboo-agent/Chart.yaml b/src/main/charts/bamboo-agent/Chart.yaml index c96f7cca5..3ed822b26 100644 --- a/src/main/charts/bamboo-agent/Chart.yaml +++ b/src/main/charts/bamboo-agent/Chart.yaml @@ -3,7 +3,7 @@ name: bamboo-agent description: A chart for installing Bamboo Data Center remote agents on Kubernetes type: application version: '1.20.1' -appVersion: 9.6.3 +appVersion: 9.6.4 kubeVersion: ">=1.21.x-0" keywords: - Bamboo diff --git a/src/main/charts/bamboo-agent/README.md b/src/main/charts/bamboo-agent/README.md index e8b47ac80..be1f4325d 100644 --- a/src/main/charts/bamboo-agent/README.md +++ b/src/main/charts/bamboo-agent/README.md @@ -1,6 +1,6 @@ # bamboo-agent -![Version: 1.20.1](https://img.shields.io/badge/Version-1.20.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.6.3](https://img.shields.io/badge/AppVersion-9.6.3-informational?style=flat-square) +![Version: 1.20.1](https://img.shields.io/badge/Version-1.20.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.6.4](https://img.shields.io/badge/AppVersion-9.6.4-informational?style=flat-square) A chart for installing Bamboo Data Center remote agents on Kubernetes diff --git a/src/main/charts/bamboo/Chart.yaml b/src/main/charts/bamboo/Chart.yaml index 88a8ed300..2cfb3112e 100644 --- a/src/main/charts/bamboo/Chart.yaml +++ b/src/main/charts/bamboo/Chart.yaml @@ -3,7 +3,7 @@ name: bamboo description: A chart for installing Bamboo Data Center on Kubernetes type: application version: '1.20.1' -appVersion: 9.6.3 +appVersion: 9.6.4 kubeVersion: ">=1.21.x-0" keywords: - Bamboo diff --git a/src/main/charts/bamboo/README.md b/src/main/charts/bamboo/README.md index b0a28fa75..7448e4559 100644 --- a/src/main/charts/bamboo/README.md +++ b/src/main/charts/bamboo/README.md @@ -1,6 +1,6 @@ # bamboo -![Version: 1.20.1](https://img.shields.io/badge/Version-1.20.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.6.3](https://img.shields.io/badge/AppVersion-9.6.3-informational?style=flat-square) +![Version: 1.20.1](https://img.shields.io/badge/Version-1.20.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.6.4](https://img.shields.io/badge/AppVersion-9.6.4-informational?style=flat-square) A chart for installing Bamboo Data Center on Kubernetes @@ -102,7 +102,7 @@ Kubernetes: `>=1.21.x-0` | bamboo.sysadminCredentials.passwordSecretKey | string | `"password"` | The key in the Kubernetes Secret that contains the sysadmin password | | bamboo.sysadminCredentials.secretName | string | `nil` | The secret that contains the admin user information | | bamboo.sysadminCredentials.usernameSecretKey | string | `"username"` | The key in the Kubernetes Secret that contains the sysadmin username | -| bamboo.tomcatConfig | object | `{"acceptCount":"10","address":null,"bambooEncryptionKey":null,"clientAuth":null,"compressibleMimeType":null,"compression":null,"compressionMinSize":null,"connectionTimeout":"20000","customServerXml":"","enableLookups":"false","generateByHelm":false,"keyPass":null,"keystoreFile":null,"keystorePass":null,"maxHttpHeaderSize":"8192","maxThreads":"100","mgmtPort":"8005","minSpareThreads":"10","port":"8085","protocol":"HTTP/1.1","proxyInternalIps":null,"proxyName":null,"proxyPort":null,"redirectPort":"8443","requestAttributesEnabled":null,"scheme":null,"secret":null,"secretRequired":null,"secure":null,"sslCertificateFile":null,"sslCertificateKeyFile":null,"sslEnabled":null,"sslPass":null,"sslProtocol":null,"trustedProxies":null,"truststoreFile":null,"truststorePass":null}` | By default Tomcat's server.xml is generated in the container entrypoint from a template shipped with an official Bamboo image. However, server.xml generation may fail if container is not run as root, which is a common case if Bamboo is deployed to OpenShift. See: https://bitbucket.org/atlassian-docker/docker-bamboo-server/src/master/README.md for a complete list of xml elements. | +| bamboo.tomcatConfig | object | `{"acceptCount":"100","address":null,"bambooEncryptionKey":null,"clientAuth":null,"compressibleMimeType":null,"compression":null,"compressionMinSize":null,"connectionTimeout":"20000","customServerXml":"","enableLookups":"false","generateByHelm":false,"keyPass":null,"keystoreFile":null,"keystorePass":null,"maxHttpHeaderSize":"8192","maxThreads":"100","mgmtPort":"8005","minSpareThreads":"10","port":"8085","protocol":"HTTP/1.1","proxyInternalIps":null,"proxyName":null,"proxyPort":null,"redirectPort":"8443","requestAttributesEnabled":null,"scheme":null,"secret":null,"secretRequired":null,"secure":null,"sslCertificateFile":null,"sslCertificateKeyFile":null,"sslEnabled":null,"sslPass":null,"sslProtocol":null,"trustedProxies":null,"truststoreFile":null,"truststorePass":null}` | By default Tomcat's server.xml is generated in the container entrypoint from a template shipped with an official Bamboo image. However, server.xml generation may fail if container is not run as root, which is a common case if Bamboo is deployed to OpenShift. See: https://bitbucket.org/atlassian-docker/docker-bamboo-server/src/master/README.md for a complete list of xml elements. | | bamboo.tomcatConfig.customServerXml | string | `""` | Custom server.xml to be mounted into /opt/atlassian/bamboo/conf | | bamboo.tomcatConfig.generateByHelm | bool | `false` | Mount server.xml as a ConfigMap. Override configuration elements if necessary | | bamboo.topologySpreadConstraints | list | `[]` | Defines topology spread constraints for Bamboo pods. See details: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ | diff --git a/src/main/charts/confluence/README.md b/src/main/charts/confluence/README.md index 0848d7f8f..afbcdfc1a 100644 --- a/src/main/charts/confluence/README.md +++ b/src/main/charts/confluence/README.md @@ -97,7 +97,7 @@ Kubernetes: `>=1.21.x-0` | confluence.startupProbe.failureThreshold | int | `120` | The number of consecutive failures of the Confluence container startup probe before the pod fails startup checks. | | confluence.startupProbe.initialDelaySeconds | int | `60` | Time to wait before starting the first probe | | confluence.startupProbe.periodSeconds | int | `5` | How often (in seconds) the Confluence container startup probe will run | -| confluence.tomcatConfig | object | `{"acceptCount":"10","connectionTimeout":"20000","customServerXml":"","debug":"0","enableLookups":"false","generateByHelm":false,"maxHttpHeaderSize":"8192","maxThreads":"100","mgmtPort":"8000","minSpareThreads":"10","port":"8090","protocol":"org.apache.coyote.http11.Http11NioProtocol","proxyInternalIps":null,"proxyName":null,"proxyPort":null,"redirectPort":"8443","scheme":null,"secure":null,"trustedProxies":null,"uriEncoding":"UTF-8"}` | By default Tomcat's server.xml is generated in the container entrypoint from a template shipped with an official Confluence image. However, server.xml generation may fail if container is not run as root, which is a common case if Confluence is deployed to OpenShift. | +| confluence.tomcatConfig | object | `{"acceptCount":"100","connectionTimeout":"20000","customServerXml":"","debug":"0","enableLookups":"false","generateByHelm":false,"maxHttpHeaderSize":"8192","maxThreads":"100","mgmtPort":"8000","minSpareThreads":"10","port":"8090","protocol":"org.apache.coyote.http11.Http11NioProtocol","proxyInternalIps":null,"proxyName":null,"proxyPort":null,"redirectPort":"8443","scheme":null,"secure":null,"trustedProxies":null,"uriEncoding":"UTF-8"}` | By default Tomcat's server.xml is generated in the container entrypoint from a template shipped with an official Confluence image. However, server.xml generation may fail if container is not run as root, which is a common case if Confluence is deployed to OpenShift. | | confluence.tomcatConfig.customServerXml | string | `""` | Custom server.xml to be mounted into /opt/atlassian/confluence/conf | | confluence.tomcatConfig.generateByHelm | bool | `false` | Mount server.xml as a ConfigMap. Override configuration elements if necessary | | confluence.topologySpreadConstraints | list | `[]` | Defines topology spread constraints for Confluence pods. See details: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ | diff --git a/src/main/charts/jira/README.md b/src/main/charts/jira/README.md index 2e59cc553..006c98e73 100644 --- a/src/main/charts/jira/README.md +++ b/src/main/charts/jira/README.md @@ -123,7 +123,7 @@ Kubernetes: `>=1.21.x-0` | jira.startupProbe.failureThreshold | int | `120` | The number of consecutive failures of the Jira container startup probe before the pod fails startup checks. | | jira.startupProbe.initialDelaySeconds | int | `60` | Time to wait before starting the first probe | | jira.startupProbe.periodSeconds | int | `5` | How often (in seconds) the Jira container startup probe will run | -| jira.tomcatConfig | object | `{"acceptCount":"10","connectionTimeout":"20000","customServerXml":"","enableLookups":"false","generateByHelm":false,"maxHttpHeaderSize":"8192","maxThreads":"100","mgmtPort":"8005","minSpareThreads":"10","port":"8080","protocol":"HTTP/1.1","proxyName":null,"proxyPort":null,"redirectPort":"8443","scheme":null,"secure":null}` | By default Tomcat's server.xml is generated in the container entrypoint from a template shipped with an official Jira image. However, server.xml generation may fail if container is not run as root, which is a common case if Jira is deployed to OpenShift. | +| jira.tomcatConfig | object | `{"acceptCount":"100","connectionTimeout":"20000","customServerXml":"","enableLookups":"false","generateByHelm":false,"maxHttpHeaderSize":"8192","maxThreads":"100","mgmtPort":"8005","minSpareThreads":"10","port":"8080","protocol":"HTTP/1.1","proxyName":null,"proxyPort":null,"redirectPort":"8443","scheme":null,"secure":null}` | By default Tomcat's server.xml is generated in the container entrypoint from a template shipped with an official Jira image. However, server.xml generation may fail if container is not run as root, which is a common case if Jira is deployed to OpenShift. | | jira.tomcatConfig.customServerXml | string | `""` | Custom server.xml to be mounted into /opt/atlassian/jira/conf | | jira.tomcatConfig.generateByHelm | bool | `false` | Mount server.xml as a ConfigMap. Override configuration elements if necessary | | jira.topologySpreadConstraints | list | `[]` | Defines topology spread constraints for Jira pods. See details: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ | diff --git a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml index b800bbee4..e5dcdc80b 100644 --- a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml +++ b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml @@ -8,7 +8,7 @@ metadata: helm.sh/chart: bamboo-agent-1.20.1 app.kubernetes.io/name: bamboo-agent app.kubernetes.io/instance: unittest-bamboo-agent - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm --- # Source: bamboo-agent/templates/config-jvm.yaml @@ -20,7 +20,7 @@ metadata: helm.sh/chart: bamboo-agent-1.20.1 app.kubernetes.io/name: bamboo-agent app.kubernetes.io/instance: unittest-bamboo-agent - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm data: max_heap: 512m @@ -35,7 +35,7 @@ metadata: helm.sh/chart: bamboo-agent-1.20.1 app.kubernetes.io/name: bamboo-agent app.kubernetes.io/instance: unittest-bamboo-agent - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -62,7 +62,7 @@ spec: initContainers: containers: - name: bamboo-agent - image: "atlassian/bamboo-agent-base:9.6.3" + image: "atlassian/bamboo-agent-base:9.6.4" imagePullPolicy: IfNotPresent env: - name: BAMBOO_SERVER diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml index a69f9e099..1563080a3 100644 --- a/src/test/resources/expected_helm_output/bamboo/output.yaml +++ b/src/test/resources/expected_helm_output/bamboo/output.yaml @@ -8,7 +8,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm --- # Source: bamboo/templates/config-jvm.yaml @@ -20,7 +20,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm data: additional_jvm_args: >- @@ -38,7 +38,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm data: jmx-config.yaml: | @@ -66,7 +66,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm data: values.yaml: | @@ -357,7 +357,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm annotations: spec: @@ -380,7 +380,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm annotations: spec: @@ -402,7 +402,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm annotations: spec: @@ -426,7 +426,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -472,7 +472,7 @@ spec: name: shared-home containers: - name: bamboo - image: "atlassian/bamboo:9.6.3" + image: "atlassian/bamboo:9.6.4" imagePullPolicy: IfNotPresent env: - name: ATL_TOMCAT_SCHEME @@ -603,7 +603,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm spec: containers: @@ -647,7 +647,7 @@ metadata: helm.sh/chart: bamboo-1.20.1 app.kubernetes.io/name: bamboo app.kubernetes.io/instance: unittest-bamboo - app.kubernetes.io/version: "9.6.3" + app.kubernetes.io/version: "9.6.4" app.kubernetes.io/managed-by: Helm spec: containers: