[patch] Revert Apply kubernetes changes server side (#1461)

ibm-mas · Sep 10, 2024 · b221d12 · b221d12
1 parent bd3189f
commit b221d12
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 40 deletions.
diff --git a/ibm/mas_devops/roles/cp4d/tasks/create-cpd-core-service-accounts.yml b/ibm/mas_devops/roles/cp4d/tasks/create-cpd-core-service-accounts.yml
@@ -7,9 +7,6 @@
     name: "{{ cpd_sa_item }}"
     namespace: "{{ cpd_instance_namespace }}"
     apply: true
-    server_side_apply:
-      field_manager: ansible
-      force_conflicts: true
     definition:
       imagePullSecrets:
         - name: ibm-entitlement-key

diff --git a/ibm/mas_devops/roles/cp4d/tasks/install-cp4d.yml b/ibm/mas_devops/roles/cp4d/tasks/install-cp4d.yml
@@ -108,9 +108,6 @@
                   cpu: 200m
                   memory: 1024Mi
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # 2.4 Delete zen-operator pod to force the reconcile from the beginning after lite-cr is patched.
     # This is just a bit of a hacky way to force zen operator to read the zen version we specify.
@@ -130,9 +127,6 @@
           spec:
             replicas: 0
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     - name: "install-cp4d : Scale up ibm-zen-operator to force reconcile"
       kubernetes.core.k8s:
@@ -144,9 +138,6 @@
           spec:
             replicas: 1
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # 2.5 Wait for Zen operator ...
     - name: "install-cp4d : Wait for ibm-zen-operator to be ready again (60s delay)"

diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/create-cpd-service-accounts.yml b/ibm/mas_devops/roles/cp4d_service/tasks/create-cpd-service-accounts.yml
@@ -7,10 +7,6 @@
     name: "{{ cpd_sa_item }}"
     namespace: "{{ cpd_instance_namespace }}"
     apply: true
-    server_side_apply:
-      field_manager: ansible
-      force_conflicts: true
-
     definition:
       imagePullSecrets:
         - name: ibm-entitlement-key

diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/install.yml b/ibm/mas_devops/roles/cp4d_service/tasks/install.yml
@@ -129,9 +129,6 @@
   kubernetes.core.k8s:
     apply: yes
     template: "templates/subscription.yml.j2"
-    server_side_apply:
-      field_manager: ansible
-      force_conflicts: true
 
 # 5. Wait until the Service CRD is available
 # -----------------------------------------------------------------------------

diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-ccs.yml b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-ccs.yml
@@ -55,9 +55,6 @@
                 cpu: 250m
                 memory: 256Mi
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # 3. Delete ccs-operator pod to force the reconcile from the beginning after ccs-cr is patched.
     # -----------------------------------------------------------------------------
@@ -71,9 +68,6 @@
           spec:
             replicas: 0
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     - name: "wait-ccs : Scale up ccs-operator"
       kubernetes.core.k8s:
@@ -85,9 +79,6 @@
           spec:
             replicas: 1
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # 4. Wait for ccs operator ...
     # -----------------------------------------------------------------------------

diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-elasticsearch.yml b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-elasticsearch.yml
@@ -36,9 +36,6 @@
           spec:
             replicas: 0
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     - name: "wait/ccs : Delete elasticsearch-master-create-snapshot-repo-job so next time it recreates with right imagePullPolicy"
       kubernetes.core.k8s:
@@ -79,9 +76,6 @@
           spec:
             replicas: 1
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # 2.5 Wait for Elastic Search operator to be ready
     - name: "wait/ccs : Wait for ibm-elasticsearch-operator to be ready again (60s delay)"

diff --git a/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-wml-etcd.yml b/ibm/mas_devops/roles/cp4d_service/tasks/wait/wait-wml-etcd.yml
@@ -42,9 +42,6 @@
           spec:
             replicas: 0
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # Delete wml-cpd-etcd statefulset so next time it recreates with proper upgrade specs
     - name: "wait/wml : Delete wml-cpd-etcd statefulset so next time it recreates with proper upgrade specs"
@@ -66,9 +63,6 @@
           spec:
             replicas: 1
         apply: true
-        server_side_apply:
-          field_manager: ansible
-          force_conflicts: true
 
     # Wait for ibm-cpd-wml-operator to be ready
     - name: "wait/ccs : Wait for ibm-cpd-wml-operator to be ready again (60s delay)"