Fixed conflicts

nephio-experimental · May 3, 2023 · a8fd1b1 · a8fd1b1
1 parent 186408d
commit a8fd1b1
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/nephio-ansible-install/roles/nephio/deploy/tasks/mgmtcluster_files.yaml b/nephio-ansible-install/roles/nephio/deploy/tasks/mgmtcluster_files.yaml
@@ -62,15 +62,25 @@
     - gitea_username is defined
 
 - name: configure nephio ingress online
-  shell: |
-    kubectl --kubeconfig ~/.kube/mgmt-config \
-      apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+  block:
+    - name: label the master node to indicate ingress ready (needed for non-KIND clusters)
+      shell: |
+        kubectl --kubeconfig ~/.kube/mgmt-config label nodes -l node-role.kubernetes.io/control-plane ingress-ready=true
+    - name: apply the ingress resource to nephio management cluster
+      shell: |
+        kubectl --kubeconfig ~/.kube/mgmt-config \
+          apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
   when: (installation_mode=='online')
 
 - name: configure nephio ingress offline
-  shell: |
-    kubectl --kubeconfig ~/.kube/mgmt-config \
-      apply -f "{{ installer_lib }}/kind_deploy.yaml"
+  block:
+    - name: label the master node to indicate ingress ready (needed for non-KIND clusters)
+      shell: |
+        kubectl --kubeconfig ~/.kube/mgmt-config label nodes -l node-role.kubernetes.io/control-plane ingress-ready=true
+    - name: apply the ingress resource to nephio management cluster
+      shell: |
+        kubectl --kubeconfig ~/.kube/mgmt-config \
+          apply -f "{{ installer_lib }}/kind_deploy.yaml"
   when: (installation_mode=='offline')
 
 - name: wait for ingress controller