SYS-607 update gitlab helm chart to 16.3.3; tweak ansible for virtualbox

instantlinux · Sep 14, 2023 · a179669 · a179669
1 parent c9551c6
commit a179669
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ansible/roles/fileserver/tasks/virtualbox.yml b/ansible/roles/fileserver/tasks/virtualbox.yml
@@ -1,14 +1,17 @@
 ---
 
 - name: Virtualbox repo key
-  apt_key:
+  get_url:
     url: "{{ item }}"
+    dest: /etc/apt/keyrings/{{ item | basename }}
   with_items:
   - "{{ virtualbox.apt_repo.key_urls }}"
 
 - name: Virtualbox repository
   apt_repository:
-    repo: deb [arch=amd64] {{ virtualbox.apt_repo.url }} {{ ansible_distribution_release }} contrib
+    repo: >
+      deb [arch=amd64 signed-by=/etc/apt/keyrings/oracle_vbox_2016.asc]
+      {{ virtualbox.apt_repo.url }} {{ ansible_distribution_release }} contrib
     filename: virtualbox
 
 - name: Virtualbox package

diff --git a/k8s/helm/gitlab/Chart.yaml b/k8s/helm/gitlab/Chart.yaml
@@ -7,8 +7,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://gitlab.com/gitlab-org/gitlab
 type: application
-version: 0.1.6
-appVersion: "15.8.0-ce.0"
+version: 0.1.7
+appVersion: "16.3.3-ce.0"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/k8s/helm/gitlab/templates/configmap.yaml b/k8s/helm/gitlab/templates/configmap.yaml
@@ -7,7 +7,6 @@ metadata:
 data:
   gitlab.rb: |
     external_url 'http://{{ .Values.tlsHostname }}'
-    gitaly['logging_level'] = '{{ .Values.gitaly.logging_level }}'
     gitlab_rails['backup_keep_time'] = 2592000
     gitlab_rails['db_adapter'] = 'postgresql'
     gitlab_rails['db_encoding'] = 'utf8'

diff --git a/k8s/helm/gitlab/values.yaml b/k8s/helm/gitlab/values.yaml
@@ -1,6 +1,4 @@
 # Default values for gitlab.
-gitaly:
-  logging_level: warn
 gitlab_shell:
   log_level: WARN
 nginx: