Merge pull request #341 from cloud-pi-native/develop

Develop
cloud-pi-native · Sep 24, 2024 · a116b7e · a116b7e
2 parents 48fd127 + 4a37098
commit a116b7e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/roles/socle-config/files/releases.yaml b/roles/socle-config/files/releases.yaml
@@ -17,16 +17,16 @@ spec:
     release: "1.*.*"
   gitlab:
     # https://artifacthub.io/packages/helm/gitlab/gitlab
-    chartVersion: "8.2.1"
+    chartVersion: "8.4.0"
   gitlabCiPipelinesExporter:
     # https://github.com/mvisonneau/helm-charts/tree/main/charts/gitlab-ci-pipelines-exporter
     chartVersion: "0.3.4"
   gitlabOperator:
     # https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/tags
-    chartVersion: "1.2.1"
+    chartVersion: "1.4.0"
   gitlabRunner:
     # https://gitlab.com/gitlab-org/charts/gitlab-runner/-/tags
-    chartVersion: "0.67.1"
+    chartVersion: "0.69.0"
   grafana:
     # https://github.com/grafana/grafana/tags
     imageVersion: "10.4.3"

diff --git a/roles/vault/templates/values/10-proxy.j2 b/roles/vault/templates/values/10-proxy.j2
@@ -3,5 +3,5 @@ server:
   extraEnvironmentVars:
     HTTP_PROXY: "{{ dsc.proxy.http_proxy }}"
     HTTPS_PROXY: "{{ dsc.proxy.https_proxy }}"
-    NO_PROXY: "{{ dsc.proxy.no_proxy }}"
+    NO_PROXY: "{{ dsc.proxy.no_proxy }},.{{ dsc_name }}-vault-internal"
 {% endif %}
diff --git a/versions.md b/versions.md
@@ -4,10 +4,10 @@
 | certmanager               | 1.14.3           | 1.14.3        | [certmanager](https://github.com/cert-manager/cert-manager/releases)                    |
 | cloudnativepg             | 1.22.1           | 0.20.1        | [cloudnativepg](https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg)     |
 | console                   | 8.0.2            | 8.0.2         | [console](https://github.com/cloud-pi-native/console/releases)                          |
-| gitlab                    | 17.2.1           | 8.2.1         | [gitlab](https://artifacthub.io/packages/helm/gitlab/gitlab)                            |
+| gitlab                    | 17.4.0           | 8.4.0         | [gitlab](https://artifacthub.io/packages/helm/gitlab/gitlab)                            |
 | gitlabCiPipelinesExporter | 0.5.8            | 0.3.4         | https://github.com/mvisonneau/helm-charts/tree/main/charts/gitlab-ci-pipelines-exporter |
-| gitlabOperator            | 1.2.1            | 1.2.1         | [gitlabOperator](https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/tags)     |
-| gitlabRunner              | 17.2.1           | 0.67.1        | [gitlabRunner](https://gitlab.com/gitlab-org/charts/gitlab-runner/-/tags)               |
+| gitlabOperator            | 1.4.0            | 1.4.0         | [gitlabOperator](https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/tags)     |
+| gitlabRunner              | 17.4.0           | 0.69.0        | [gitlabRunner](https://gitlab.com/gitlab-org/charts/gitlab-runner/-/tags)               |
 | grafana                   | 10.4.3            | N/A           | [grafana](https://github.com/grafana/grafana/tags)                                      |
 | grafanaOperator           | 5.10.0            | 5.4.2         | [grafanaOperator](https://github.com/grafana/grafana-operator/tags)                     |
 | harbor                    | 2.10.1           | 1.14.1        | [harbor](https://artifacthub.io/packages/helm/harbor/harbor)                            |