From 1934d00b6e6b4c08ef32b35eaaa1465716c78fc5 Mon Sep 17 00:00:00 2001 From: Silvester Date: Sat, 22 May 2021 10:28:47 +0300 Subject: [PATCH 1/8] Update busybox image version to 1.33.1 --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index a6049a4805..5e14fb4224 100644 --- a/values.yaml +++ b/values.yaml @@ -641,7 +641,7 @@ global: busybox: image: repository: busybox - tag: latest + tag: 1.33.1 ## https://docs.gitlab.com/charts/charts/globals#service-accounts serviceAccount: -- GitLab From 737d72466190db0f0774be4aa4138eeeafea36d4 Mon Sep 17 00:00:00 2001 From: Silvester Date: Sat, 22 May 2021 10:47:58 +0300 Subject: [PATCH 2/8] Update kas apiversion Changelog: changed --- charts/gitlab/charts/kas/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitlab/charts/kas/Chart.yaml b/charts/gitlab/charts/kas/Chart.yaml index 69343ec0da..d32a3e88e4 100644 --- a/charts/gitlab/charts/kas/Chart.yaml +++ b/charts/gitlab/charts/kas/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: kas version: 4.12.0 -appVersion: latest +appVersion: master description: GitLab Kubernetes Agent Server keywords: - agent -- GitLab From bde3af2e907abd3dc26b3fbac609818e0821e1dc Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 25 May 2021 09:42:49 +0300 Subject: [PATCH 3/8] Update to stable --- charts/gitlab/charts/kas/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitlab/charts/kas/Chart.yaml b/charts/gitlab/charts/kas/Chart.yaml index d32a3e88e4..bccc1f8e59 100644 --- a/charts/gitlab/charts/kas/Chart.yaml +++ b/charts/gitlab/charts/kas/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: kas version: 4.12.0 -appVersion: master +appVersion: stable description: GitLab Kubernetes Agent Server keywords: - agent -- GitLab From fbf576544fa5ce7a885b874eab3b134a159eadb4 Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 25 May 2021 13:08:12 +0300 Subject: [PATCH 4/8] Add kas dependency --- deps.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deps.yml b/deps.yml index 6e32108158..d61fffb892 100644 --- a/deps.yml +++ b/deps.yml @@ -61,3 +61,8 @@ dependencies: replace_in_files: - filename: requirements.yaml pattern: 'name: gitlab-runner\n version: (\S+)' + # Kas + https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent.git: + replace_in_files: + - filename: charts/gitlab/charts/kas/Chart.yaml + pattern: 'appVersion: (\S+)' \ No newline at end of file -- GitLab From c031c00d281d840197d7efef6fc3880b4fc00b4a Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 25 May 2021 14:25:59 +0300 Subject: [PATCH 5/8] Update deps to update doc --- charts/gitlab/charts/kas/Chart.yaml | 2 +- charts/gitlab/charts/kas/values.yaml | 1 + deps.yml | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/gitlab/charts/kas/Chart.yaml b/charts/gitlab/charts/kas/Chart.yaml index bccc1f8e59..7b10141321 100644 --- a/charts/gitlab/charts/kas/Chart.yaml +++ b/charts/gitlab/charts/kas/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: kas version: 4.12.0 -appVersion: stable +appVersion: 13.12.1 description: GitLab Kubernetes Agent Server keywords: - agent diff --git a/charts/gitlab/charts/kas/values.yaml b/charts/gitlab/charts/kas/values.yaml index 99dd0b9d3b..19c6372e14 100644 --- a/charts/gitlab/charts/kas/values.yaml +++ b/charts/gitlab/charts/kas/values.yaml @@ -22,6 +22,7 @@ hpa: image: repository: registry.gitlab.com/gitlab-org/cluster-integration/gitlab-agent/kas # tag: latest + pullPolicy: 'IfNotPresent' ingress: annotations: {} tls: {} diff --git a/deps.yml b/deps.yml index d61fffb892..ad2b79b021 100644 --- a/deps.yml +++ b/deps.yml @@ -65,4 +65,8 @@ dependencies: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent.git: replace_in_files: - filename: charts/gitlab/charts/kas/Chart.yaml - pattern: 'appVersion: (\S+)' \ No newline at end of file + pattern: 'appVersion: (\S+)' + - filename: doc/charts/kas/index.md + pattern: '`v(\d+\.\d+\.\d+)`' + range: '>= 2.x.x' + prereleases: true \ No newline at end of file -- GitLab From f564281ae24ea4b15eb1caafd8d63ffe83782cf7 Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 25 May 2021 14:30:44 +0300 Subject: [PATCH 6/8] Set correct doc path --- deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.yml b/deps.yml index ad2b79b021..61b46cbfc3 100644 --- a/deps.yml +++ b/deps.yml @@ -66,7 +66,7 @@ dependencies: replace_in_files: - filename: charts/gitlab/charts/kas/Chart.yaml pattern: 'appVersion: (\S+)' - - filename: doc/charts/kas/index.md + - filename: doc/charts/gitlab/kas/index.md pattern: '`v(\d+\.\d+\.\d+)`' range: '>= 2.x.x' prereleases: true \ No newline at end of file -- GitLab From 3fb36db989dce40380a77bee444a44b75374be52 Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 25 May 2021 15:54:17 +0300 Subject: [PATCH 7/8] Update kas docs image version --- doc/charts/gitlab/kas/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/charts/gitlab/kas/index.md b/doc/charts/gitlab/kas/index.md index a8187c1cf3..6cdd15c7ba 100644 --- a/doc/charts/gitlab/kas/index.md +++ b/doc/charts/gitlab/kas/index.md @@ -42,7 +42,7 @@ the `helm install` command using the `--set` flags. | `annotations` | `{}` | Pod annotations | | `extraContainers` | | List of extra containers to include | | `image.repository` | `registry.gitlab.com/gitlab-org/cluster-integration/gitlab-agent/kas` | image repository | -| `image.tag` | `v13.7.0` | Image tag | +| `image.tag` | `v13.12.1` | Image tag | | `hpa.targetAverageValue` | `100m` | Set the autoscaling target value (CPU) | | `ingress.enabled` | `true` if `global.kas.enabled=true` | You can use `kas.ingress.enabled` to explicitly turn it on or off. If not set, you can optionally use `global.ingress.enabled` for the same purpose. | | `ingress.annotations` | `{}` | Ingress annotations | -- GitLab From 1fe33122eef4cab9bdf09928d99ad8f26e626b23 Mon Sep 17 00:00:00 2001 From: Silvester Date: Tue, 25 May 2021 20:07:31 +0300 Subject: [PATCH 8/8] Revert busybox changes to split changes --- values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.yaml b/values.yaml index 5e14fb4224..a6049a4805 100644 --- a/values.yaml +++ b/values.yaml @@ -641,7 +641,7 @@ global: busybox: image: repository: busybox - tag: 1.33.1 + tag: latest ## https://docs.gitlab.com/charts/charts/globals#service-accounts serviceAccount: -- GitLab