Better

epfl-si · Oct 17, 2024 · e33fe6c · e33fe6c
1 parent 9dbe59d
commit e33fe6c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/ansible/archivewebsible b/ansible/archivewebsible
@@ -25,7 +25,7 @@ ensure_suitcase () {
   if ! test -f ansible-deps-cache/.versions 2>/dev/null; then
     curl https://raw.githubusercontent.com/epfl-si/ansible.suitcase/master/install.sh | \
       SUITCASE_DIR=$PWD/ansible-deps-cache \
-      SUITCASE_ANSIBLE_VERSION=10.5.0 \
+      SUITCASE_ANSIBLE_VERSION=9.11.0 \
       SUITCASE_ANSIBLE_REQUIREMENTS=requirements.yml \
       SUITCASE_WITH_KEYBASE=1 \
       SUITCASE_PIP_EXTRA="kubernetes" \

diff --git a/ansible/playbook.yml b/ansible/playbook.yml
@@ -1,11 +1,11 @@
 - name: Archive Web Kubernetes objects
   hosts: openshift_namespaces
-  gather_facts: yes
+  gather_facts: true
   roles:
-    - role: roles/archiveweb-k8s
+    - role: archiveweb-k8s
 
 - name: Archive Web VM objects
-  hosts: itspress0001
-  gather_facts: no
+  hosts: vms
+  gather_facts: false
   roles:
-    - role: roles/archiveweb-vm
+    - role: archiveweb-vm
diff --git a/ansible/roles/archiveweb-k8s/tasks/cronjob.yml b/ansible/roles/archiveweb-k8s/tasks/cronjob.yml
@@ -13,6 +13,7 @@
           spec:
             template:
               spec:
+                serviceAccountName: '{{ app_name }}-service-account'
                 containers:
                   - name: '{{ app_name }}-job'
                     image: '{{ quay_registry }}/{{ app_name }}-job:{{ tag }}'

diff --git a/ansible/roles/archiveweb-k8s/tasks/nginx.yml b/ansible/roles/archiveweb-k8s/tasks/nginx.yml
@@ -59,7 +59,7 @@
           app: '{{ app_name }}'
           team: '{{ team }}'
       spec:
-        replicas: 1
+        replicas: 2
         selector:
           matchLabels:
             app: '{{ app_name }}'
@@ -74,19 +74,18 @@
             containers:
               - name: '{{ app_name }}'
                 image: '{{ quay_registry }}/{{ app_name }}:{{ tag }}'
-                imagePullPolicy: Always
                 volumeMounts:
                   - name: 'public'
                     mountPath: '/public'
                   - name: nginx-conf-volume
                     mountPath: /etc/nginx/conf.d
                 resources:
                   limits:
-                    cpu: 1000m
-                    memory: 1Gi
+                    cpu: 250m
+                    memory: 256Mi
                   requests:
-                    cpu: 500m
-                    memory: 512Mi
+                    cpu: 100m
+                    memory: 128Mi
             volumes:
               - name: 'public'
                 persistentVolumeClaim: