Merge pull request #193 from RS-PYTHON/fix/missing-dependencies-bastion

fix: add yq dependencies on bastion + regex for registry replacement

Author: nleconte-csgroup

roles/app-installer/tasks/install_app.yaml

@@ -102,12 +102,12 @@
             s|image: (docker.io\/)?([a-z0-9\-]+\/[a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?|image: {{ registry.harbor_url | regex_replace('^https?://', '') }}/proxycache/\2\3\4|
             b
           }
-          /image: ([a-z0-9\-]+\/[a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?/ {
-            s|image: ([a-z0-9\-]+\/[a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?|image: {{ registry.harbor_url | regex_replace('^https?://', '') }}/proxycache/\1\2\3|
+          /^image: [a-z0-9\-]+\/[a-z0-9\-]+(:[^@ ]+)?(@sha256:[a-f0-9]{64})?$/ {
+            s|^image: ([a-z0-9\-]+\/[a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?|image: {{ registry.harbor_url | regex_replace('^https?://', '') }}/proxycache/\1\2\3|
             b
           }
-          /image: ([a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?/ {
-            s|image: ([a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?|image: {{ registry.harbor_url | regex_replace('^https?://', '') }}/proxycache/\1\2\3|
+          /^image: [a-z0-9\-]+(:[^@ ]+)?(@sha256:[a-f0-9]{64})?$/ {
+            s|^image: ([a-z0-9\-]+)(:[^@ ]+)?(@sha256:[a-f0-9]{64})?|image: {{ registry.harbor_url | regex_replace('^https?://', '') }}/proxycache/\1\2\3|
           }
         }' \
         | yq eval 'select(.kind == "Pod") |= .spec.imagePullSecrets += [{"name": "harbor-pull-secret"}] |

roles/terraform/cluster/tasks/main.yaml

@@ -297,7 +297,45 @@
     state: link
   become: true
   delegate_to: "{{ bastion_ip.stdout }}"
+  
+- name: Create yq directory
+  ansible.builtin.file:
+    path: /opt/yq
+    state: directory
+  become: true
+  delegate_to: "{{ bastion_ip.stdout }}"
+
+- name: Download yq from makefarah github
+  ansible.builtin.uri:
+    url: https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+    dest: /opt/yq/yq
+    follow_redirects: safe
+  become: true
+  delegate_to: "{{ bastion_ip.stdout }}"
 
+- name: Change yq file permission
+  ansible.builtin.file:
+    path: /opt/yq/yq
+    mode: '0700'
+  become: true
+  delegate_to: "{{ bastion_ip.stdout }}"
+
+- name: Create a symlink to yq
+  ansible.builtin.file:
+    src: "/opt/yq/yq"
+    dest: "/usr/local/bin/yq"
+    state: link
+  become: true
+  delegate_to: "{{ bastion_ip.stdout }}"
+
+- name: Create a symlink to yq
+  ansible.builtin.file:
+    src: "/opt/yq/yq"
+    dest: "/usr/bin/yq"
+    state: link
+  become: true
+  delegate_to: "{{ bastion_ip.stdout }}"
+  
 - name: Clean install scripts
   ansible.builtin.file:
     path: "{{ item }}"