From 7bd1a1436b54882ad75a55a2cfe31a0f1bc8cc97 Mon Sep 17 00:00:00 2001
From: friedrich goerz <friedrich.goerz@netgo.de>
Date: Tue, 15 Feb 2022 13:19:22 +0100
Subject: [PATCH] DEv-323: try to fix merge-conflict

---
 roles/kubernetes/apps/tasks/argocd.yml | 84 +++++++++++++-------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/roles/kubernetes/apps/tasks/argocd.yml b/roles/kubernetes/apps/tasks/argocd.yml
index ba5b8cc..b0a5304 100644
--- a/roles/kubernetes/apps/tasks/argocd.yml
+++ b/roles/kubernetes/apps/tasks/argocd.yml
@@ -220,45 +220,45 @@
   when:
   - inventory_hostname == groups['kube_control_plane'][0]
 
-#- name: Checkout defined argocd-related objects
-#  ansible.builtin.git:
-#    repo: 'https://{{ gitea_admin_username }}:{{ gitea_admin_password }}@dev-gitea-01.smardigo.digital/gitea-admin/argocd.git'
-#    dest: '/tmp/gitrepo'
-#    version: master
-#  when:
-#  - inventory_hostname == groups['kube_control_plane'][0]
-#
-#- name: Find file with definition of argocd-AppProjects
-#  find:
-#    paths: '/tmp/gitrepo/AppProjects'
-#    pattern: '*.yml'
-#  register: appprojects
-#  when:
-#  - inventory_hostname == groups['kube_control_plane'][0]
-#
-#- name: Find file with definition of argocd-ApplicationSets
-#  find:
-#    paths: '/tmp/gitrepo/ApplicationSets'
-#    pattern: '*.yml'
-#  register: applicationsets
-#  when:
-#  - inventory_hostname == groups['kube_control_plane'][0]
-#
-#- name: Apply defined AppProjects defined in checked out repo
-#  kubernetes.core.k8s:
-#    state: present
-#    namespace: '{{ k8s_argocd_helm__release_namespace }}'
-#    src: '{{ item.path }}'
-#  loop: '{{ appprojects.files }}'
-#  when:
-#  - inventory_hostname == groups['kube_control_plane'][0]
-#
-#- name: Apply defined ApplicationSets defined in checked out repo
-#  kubernetes.core.k8s:
-#    state: present
-#    namespace: '{{ k8s_argocd_helm__release_namespace }}'
-#    src: '{{ item.path }}'
-#  loop: '{{ applicationsets.files }}'
-#  when:
-#  - inventory_hostname == groups['kube_control_plane'][0]
- 
\ No newline at end of file
+- name: Checkout defined argocd-related objects
+  ansible.builtin.git:
+    repo: 'https://{{ gitea_admin_username }}:{{ gitea_admin_password }}@dev-gitea-01.smardigo.digital/gitea-admin/argocd.git'
+    dest: '/tmp/gitrepo'
+    version: master
+  when:
+  - inventory_hostname == groups['kube_control_plane'][0]
+
+- name: Find file with definition of argocd-AppProjects
+  find:
+    paths: '/tmp/gitrepo/AppProjects'
+    pattern: '*.yml'
+  register: appprojects
+  when:
+  - inventory_hostname == groups['kube_control_plane'][0]
+
+- name: Find file with definition of argocd-ApplicationSets
+  find:
+    paths: '/tmp/gitrepo/ApplicationSets'
+    pattern: '*.yml'
+  register: applicationsets
+  when:
+  - inventory_hostname == groups['kube_control_plane'][0]
+
+- name: Apply defined AppProjects defined in checked out repo
+  kubernetes.core.k8s:
+    state: present
+    namespace: '{{ k8s_argocd_helm__release_namespace }}'
+    src: '{{ item.path }}'
+  loop: '{{ appprojects.files }}'
+  when:
+  - inventory_hostname == groups['kube_control_plane'][0]
+
+- name: Apply defined ApplicationSets defined in checked out repo
+  kubernetes.core.k8s:
+    state: present
+    namespace: '{{ k8s_argocd_helm__release_namespace }}'
+    src: '{{ item.path }}'
+  loop: '{{ applicationsets.files }}'
+  when:
+  - inventory_hostname == groups['kube_control_plane'][0]
+