salt master gitlab runner repo fixes

Author: Jetman80

salt/master.sls

@@ -183,19 +183,19 @@ salt_master_gitlab-runner_unregister:
     - name: |
         gitlab-runner unregister --url "{{ pillar["salt"]["master"]["gitlab-runner"]["gitlab_url"] }}/" --all-runners || true
 
-salt_master_gitlab-runner_repo:
-  pkgrepo.managed:
-    - humanname: Gitlab Runner Repository
-    - name: deb https://packages.gitlab.com/runner/gitlab-runner/{{ grains['os']|lower }}/ {{ grains['oscodename'] }} main
-    - file: /etc/apt/sources.list.d/gitlab-runner.list
-    - key_url: https://packages.gitlab.com/gpg.key
-    - clean_file: True
-
-# The following signatures were invalid: EXPKEYSIG 3F01618A51312F3F GitLab B.V. (package repository signing key) <packages@gitlab.com>
-# even with previous state -> some bug workaround
-salt_master_gitlab-runner_repo_key_hack:
-  cmd.run:
-    - name: "curl -s https://packages.gitlab.com/gpg.key | sudo apt-key add -"
+salt_master_gitlab-runner_repo_key:
+  file.managed:
+    - name: /etc/apt/keyrings/gitlab-runner-archive-keyring.asc
+    - source: https://packages.gitlab.com/gpgkey/gpg.key
+    - skip_verify: True
+
+salt_master_gitlab-runner_repo_list:
+  file.managed:
+    - name: /etc/apt/sources.list.d/gitlab-runner.list
+    - contents: |
+        deb [signed-by=/etc/apt/keyrings/gitlab-runner-archive-keyring.asc] https://packages.gitlab.com/runner/gitlab-runner/{{ grains['os']|lower }}/ {{ grains['oscodename'] }} main
+    - require:
+      - file: salt_master_gitlab-runner_repo_key
 
 salt_master_gitlab-runner_config_dir:
   file.directory: