Merge pull request #258 from jaxesn/jgw/fix-ready-on-rejoin

fixes cilium operator tolerations

test/e2e/cni/testdata/cilium/cilium-template.yaml

@@ -20,8 +20,8 @@ metadata:
   name: cilium-ca
   namespace: kube-system
 data:
-  ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURGRENDQWZ5Z0F3SUJBZ0lSQU9KRjhoZmdUeXNQL3R6V2ZuZTNsdFF3RFFZSktvWklodmNOQVFFTEJRQXcKRkRFU01CQUdBMVVFQXhNSlEybHNhWFZ0SUVOQk1CNFhEVEkwTVRJeE56SXhNVEV5TVZvWERUSTNNVEl4TnpJeApNVEV5TVZvd0ZERVNNQkFHQTFVRUF4TUpRMmxzYVhWdElFTkJNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DCkFROEFNSUlCQ2dLQ0FRRUExYTlRV2pPRU14RTFsZHRkWXN5SGdUdVJWdDV3bWNJVFRBcVdvNXIvYVJQdFZCZ04KYXJyeTVCbUxyaUtJaURGc3M4RlRMTUxNeEdWWkozNXlraWFhMmxHWkM2TmRseWtyM0hCZFhjNy9WdjkwcWlVNwpOU2NCMUdWeFFuS0g3QXV5ckxWMTlGemwvNVZDcmZHWlRKVklUd2RWNTFYdlZyTi9KbXd2c2l2MGdhVnhoSDNyCjJKZWU3NGlDUkNVcVNwR3BTenhUL1lQaUhibmZxMmpqREEyUitGQ0ovN3N3V21KemZ3NmhUY08xTFdaWHJyekwKRXZmZ29vcWV2dkVzcisycTBjZDc2djlJSDF5bFVSbk5kS1h5dDBSNTJoTlUzUVFyYThVTHIyb0xJNjJjWGtNSApWYi9PTktIMmVhdWhEQU5IVXpQTmdCTjY5SnRHbmtuV1hjbmJIUUlEQVFBQm8yRXdYekFPQmdOVkhROEJBZjhFCkJBTUNBcVF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0dBUVVGQndNQ01BOEdBMVVkRXdFQi93UUYKTUFNQkFmOHdIUVlEVlIwT0JCWUVGSVpxNmFCeXBHeWVXZjZ0Rk5EN3BpZzQ4TW9aTUEwR0NTcUdTSWIzRFFFQgpDd1VBQTRJQkFRQUlMSmY2ZlNSaTdwcEozZW9WMlg5RExZaTR1b2tuMjk5TVh0V2pIc3ZDYXY3bGhkb0VCcm55Cm9yWXRMelh1OUdTYlhsbmtTVldvUnlMVE9BMmJWQVpTRTZhK0h1dEVadFQ3RGNSYVg0cHJXZk5idzd5dWNzRmQKeFh2akh4VXBuN0t3VkhjNWlzc2JnUHJ4UlFESXlFVHJ2NkMwNXRBbWw4c0EySmgwWFZVb3Z5NjdrSGc0TENKMApKd3F1MGh6Z2pCYTd1NW4yZU9vRmJma3phK2syZEkyMUV0UHdiVExwK3lkdlljcjhZRGVISkVEdEFOV2o3WVYwClVJWFVFMkZyZXBzSXkzcXQzRGJZOGVPdmIxWGFHOXh1QkhGMlp5cTdxM0NvdXJIUVlTSzBZRmJNTGN4LzZXVDUKWERjUVExaVNOdnZuZzY2VDhCZk5lWkY3ZUVaMk0zNlMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-  ca.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBMWE5UVdqT0VNeEUxbGR0ZFlzeUhnVHVSVnQ1d21jSVRUQXFXbzVyL2FSUHRWQmdOCmFycnk1Qm1McmlLSWlERnNzOEZUTE1MTXhHVlpKMzV5a2lhYTJsR1pDNk5kbHlrcjNIQmRYYzcvVnY5MHFpVTcKTlNjQjFHVnhRbktIN0F1eXJMVjE5RnpsLzVWQ3JmR1pUSlZJVHdkVjUxWHZWck4vSm13dnNpdjBnYVZ4aEgzcgoySmVlNzRpQ1JDVXFTcEdwU3p4VC9ZUGlIYm5mcTJqakRBMlIrRkNKLzdzd1dtSnpmdzZoVGNPMUxXWlhycnpMCkV2Zmdvb3FldnZFc3IrMnEwY2Q3NnY5SUgxeWxVUm5OZEtYeXQwUjUyaE5VM1FRcmE4VUxyMm9MSTYyY1hrTUgKVmIvT05LSDJlYXVoREFOSFV6UE5nQk42OUp0R25rbldYY25iSFFJREFRQUJBb0lCQVFDQVNkcWg3Ti9ua09Ocwo3dUJvR29jWDdWMWFtLzFhTW94SFVPd1RtVkRTRXlhZklEbWQ1Rk5DNHB0Ymxsd0YrRFpjelNwVWF6ZG9pYmcyCjM5R0ZNU3d5K2w0NkFJQ0Y2aS90RG9EZmV4RU5lQnpnc2EyVVFiRDFoVm0wSFBMQm9seEpHRUNTenRzKzBLdlIKcG9UMDE0TXIveWx4MDhQM2Q1aFV4d3J6bXpRV1NOYWlCSGk1QWc3eXhvZ29oWFNYajhjQ3Jhc1hNTXdTSHIvRwpnYjdLY2FYYU5yQUYvcmVBMU9CQktEV0NFQlF0MlFndzRxd09kRzZJYnNnNVdadnF2c0FJaUxjK0VYYUpTZHFNCjBXeUxrcUxvZXRFTVEvcU5pNnZVZFIremFacUFrL2VyMVZNTTJQQ1hTWlR4Rkhsb0huSVdLNDFLdnpIYjlSYXAKSUUyYUdrTjVBb0dCQU9NUnRmdXN3dnRvUUxJQXpnTXZuV3A0elpiSW9EOE53TitreWp4amJ5Vi9kSzNmdkxtSQpub1VaQWVRbCtnUjhqaWhoRzRaUnBsR2ZKMFUyakZsVUoydjRlb0gxMVg2Y2pZVkhJcUUxbHNKbk1YZUl6Y0hqCnRlS1FpNVY4TFJkck14TnhYWGZWUWY1bU50bmIrdnBCNndUekVaSHZVd2cxeElNeCtlZ1A3UCtYQW9HQkFQRHAKQy9vaEhiU3BLMHZuUnhaMzV0MVQwN2czbFdWamt3VVJEeC8yWGdJMStFQ05rZExwNDNlVU0vZlFydUhoSnlpeAplL2ZIQUlJOStkbmRIdnBYcUhSSXJBazZ3NDRUcWlHRW5HWmswK0x1Z2FJeXZMYXZGN004SEhzMDRkbXErenE3CnBtUVFjRXVPWWFtOEszTWpUNnFRam5udkExUnh1MjY4RXZ6RmpoRnJBb0dCQU1zWDF6WlFjbUVkQU9oMDhjNUYKc3owODZWMVkrb01MRVJ5M0xxOU9uR1hrbHY3QlkvSnFNS2FKRkhqMFFxZnFvOWVYNjE5Ni9oQjVFazNFbVVsNApqSDMwMDlZVGhDM25abWp6bEJTdWNyWlVTQmxMQWdYT1hxdFRiNVYzYUhsT3gzTTNiVXMyTWYyUmZMUGxIcGpoCmhveDV2NWhRZjJxVGRMMkhZS2RnUHpEbkFvR0FDU1JlM3Z3WXUzMWI5a0p0a1MyMXBocURRMDlnclB0TlhmamEKd1JUQlZvWWp5SmRXdkZGQjM0elJPQXRFUjdBYW8xR3c2YU0wb3J5bFdaNHBpY2gvelFIZy9XeXNkUnpMN1AreQpTN1J4MGYvSkRaV3RVYVZ0V2REako4M0c4RktydS92WkFaMGFGZFB1WXRtUU1JdGJmNWFDd1ovUFdZb0RXZDFyClB3cGtMTWNDZ1lCYXpRMTAzTEt1bkpSY3RDaDJReER6bHNyaEJvNjdWNjJQaGdCUnpnYy9rZ0UxUktVVVlzVGYKaFZqaU8xZWNxd3FJL1J3dUJnc0EzWEx4R1g4MXM3Tm1rNnNpMWh1aVhIdTZXNmpVMHZmK3VGaitROVVtc3dKYgpyUExPRGxTWm80WnRCdGRYK0wyaDNINkI1UU5XRlFVbkVRK2cxbENxV0FwN2J3U3lFbVdEWFE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+  ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lRR0xyVkF4d2JnMkwybmpZMzM4Sk80VEFOQmdrcWhraUc5dzBCQVFzRkFEQVUKTVJJd0VBWURWUVFERXdsRGFXeHBkVzBnUTBFd0hoY05NalF4TWpJNE1UWXhPVEl4V2hjTk1qY3hNakk0TVRZeApPVEl4V2pBVU1SSXdFQVlEVlFRREV3bERhV3hwZFcwZ1EwRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCCkR3QXdnZ0VLQW9JQkFRRHFFcGx6R0ZhbUM5Nm03RWMwcnBONmh1b0hFbk13b2F6SVdzOWN2aWVuQmtlMHZXVU4KamF6Y1pWcHRYVGtMRjdMODE0dGNlb01yZUY2MHllVml5SDRWa3ZLcDYzaG5IM2hNNW4rNGF1enBLQnIzOWZZSQoxUVc1WW1icDhVdm84YWN3dEIvbzE5dFFtUUI1Sk9kdnJaU0lFci9aazNrVjVETXoxcHBhUGNhMUh5dThsSUxICldlZWR1aVdLdUxQYThGbkpzSG5GdFZKQmNMbzNQMm93T0JaNWdhUllSbUhVOER2L3VvUVBhOHRXY0VwTXJGcTYKb1hmMnZmQUFPcWJPeitpb2t5bHhCdG82SVRFb0ptUFdyVnNxbUh1STdXdzNVL0ZMRG0vVkJ0T1czYkVJMGdWdQptRERZODJYWFNmQmdPc1pRUnBVd2c3SHN4ZStLYTVzUkpCbG5BZ01CQUFHallUQmZNQTRHQTFVZER3RUIvd1FFCkF3SUNwREFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0R3WURWUjBUQVFIL0JBVXcKQXdFQi96QWRCZ05WSFE0RUZnUVV0ei9KUG1aM2tOQnZIcEJXOTc3Z1pwU21Mb1l3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFBZnpuVlF5OEIvYVZoRzlMdngxbHpjOEJUY3hScE5DSHhzek5nbk8zdGVmRnRSaFM4UkRuQzVmCm56d0czQWtZeTlqNnBjeHJteFZ1ZnpMZmdMUnI3eGNDd1hvUjVEYWM3WTZYaXJadzloRUwvQnI2UjBKR05mMjkKc2hGMlcvVjgxb1RqWXpzUmVTN0FJUHgxOXhVM0RQcjZCdlR6YVhReFl2aGN3V201Y1hvUmNBWkdXaWhqWVZaZgpydHQ0OWVhMkhDOUFwSFN0MXJGckgxRmMwekNQN29GV2JRZXNvOEtzYjZLWXpQK1RqeEpINVhJNld4N0x3ai9qCnlxK1hSeTU4eUo0TmRPN3JoYXBCVWdwUWRMMk9uQ256RmVFbFl2aWJQWUkwK2NEQjhwSHdLazhHQjgrYW5VQWkKb1FhdldTVnJHUG1xd2ltb3d3dmdoUDEyaVZhdDVEQT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+  ca.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBNmhLWmN4aFdwZ3ZlcHV4SE5LNlRlb2JxQnhKek1LR3N5RnJQWEw0bnB3Wkh0TDFsCkRZMnMzR1ZhYlYwNUN4ZXkvTmVMWEhxREszaGV0TW5sWXNoK0ZaTHlxZXQ0Wng5NFRPWi91R3JzNlNnYTkvWDIKQ05VRnVXSm02ZkZMNlBHbk1MUWY2TmZiVUprQWVTVG5iNjJVaUJLLzJaTjVGZVF6TTlhYVdqM0d0UjhydkpTQwp4MW5ubmJvbGlyaXoydkJaeWJCNXhiVlNRWEM2Tno5cU1EZ1dlWUdrV0VaaDFQQTcvN3FFRDJ2TFZuQktUS3hhCnVxRjM5cjN3QURxbXpzL29xSk1wY1FiYU9pRXhLQ1pqMXExYktwaDdpTzFzTjFQeFN3NXYxUWJUbHQyeENOSUYKYnBndzJQTmwxMG53WURyR1VFYVZNSU94N01YdmltdWJFU1FaWndJREFRQUJBb0lCQVFDSFZlR3JEak5ySmduQgo4WExxSHRYZVRnc1pzNjB1UFF3dGUzUFJaNUI5bmIvdjNHR0ZDSmtkaE94WHQwSzRDeWZOME1JZTRpYmRCMmVhCmwvRXN3RWRHS2dSc0FsMUhJb2JuejQyaER4R1RiVURLaFVlUHE3cjNpTkdBQ2FlZU03bzdDcW80Y2pXM3ovN2EKREdCVHpjVEhPQy84bUt1MTRJOUtOWlpnL3I3WkVPV1Rsb3VJRWVINHptYWdWRU0xYi9vcGNLejdldkJaREV0TQptVmJkdis0a3NsZ202Vk90OTBXZUVLZTdKZ3FNZTRLQmsvKzBLZisvcFludktDTGJVNGlPVkc5bFpjZi9tSExxCmg0WmpCUncvUXFLQlQyWStLU0F3M1c2VWlMS2NMS21Wd3ZnZ0VlMXorSUk2NUdHMG9veEFxVUFVNHdGMFZ6OWcKM1h3TnRBZGhBb0dCQVBubU9TM21KSk1VTDFVVXUxZFNSbmtZUUIrQVBsVGdsbkdxWnNVMW4vVFRUWGNXenVQQQp6NGZXbFF0T1RIT3BscFNwVkJLd2U0cEdCTjU1d01GZGZqVU9ySWNzQTBqSU1KeXY4VEEyNml1YjVVUzh1bjJFCkxHVldIdXpWOU01TzhTMGlEa1MwdC9sdk1FdmYrRVEwQk43YWdNQytEMm5NVm9ObEY4REJBYS9qQW9HQkFPL0oKZHlVMzYxbnNoMzZCVWdFWmZkdW9ORmV6OTVsVnZjd3R6RVZmbm1iYW1iTnNHZFlTK1FqN0J4eUZyeTVCMGg5ZwpWY0p1VjZCajI0TjdSaTkzS3RDSUR1cE52QnRYRXlCOUhCY0sxZXNoTktYZURJK2xMKzl5UTBOc0Z6MzR4bVkyClpySWp0elhqRDNUMTVXamdLYTduWDB1T0loWGR2QjV6Vnl1cFNWK3RBb0dBZS9UUzBBMmtmc0E0YWorS1hkb1YKMHVOUWkwK1ZtNHg3azQ0dXhBdkJlRE9IN1ZhRzhUb210djZkbDZvVENoeEk4Unk4OHpoUFQxdEQ5d2Ixc2ZTcQpNYTlCclJzTDFnSlcrcUhiUlVzNEJNR2ppK0VCc0Zqcm5LaUhWbnNhbjJ0US9rNHlQYXBXeDRkN3NXYzdRcmw2CjRRQUpkWkhSRzIyY1REak0rM1BCWG5rQ2dZRUFtVlZITHpHVytpWGFidmJiTFlEVGpvYjlFYWd2aUluZm1KVWcKcnF2NmF1TVdyamxPUENwZHZYUm9rOENZeVFlbUNoSmNSTHl5cEFtMjhWai9CSk03ZWFYSGcrUzVpUEloZFFFTAoyV0JBY3Q4RS81d0NoRWlwWW9DNnFuNlFUanlyQWVsL3VpSkVvZHpVb1lJc2RPZ0RQNmtNc3cvc2svYjZ1SzRnCjYvYVF5UEVDZ1lBbkE5N0tXTk1yeGMzenZkZVpGNk8vMVgxaU9Ld2RCd2FRMDBhODJVRDZsZjBYRUVyQ20xOFMKRkFaNDMyN2ZTRENJWUhYZXhDc3pMcCs3YmV2MVowZ3NkeDdYU2E2UlJhWVBDR2libzZKR2I2N3JTV3NwNW5peQpFaG5OdHNlZ1BIR29lL0czVDFRVUI5dWJQdk94Vjl6MldFYmpBVG5VcitaU2x5UXhMbGVkQ2c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
 ---
 # Source: cilium/templates/hubble/tls-helm/server-secret.yaml
 apiVersion: v1
@@ -31,9 +31,9 @@ metadata:
   namespace: kube-system
 type: kubernetes.io/tls
 data:
-  ca.crt:  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURGRENDQWZ5Z0F3SUJBZ0lSQU9KRjhoZmdUeXNQL3R6V2ZuZTNsdFF3RFFZSktvWklodmNOQVFFTEJRQXcKRkRFU01CQUdBMVVFQXhNSlEybHNhWFZ0SUVOQk1CNFhEVEkwTVRJeE56SXhNVEV5TVZvWERUSTNNVEl4TnpJeApNVEV5TVZvd0ZERVNNQkFHQTFVRUF4TUpRMmxzYVhWdElFTkJNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DCkFROEFNSUlCQ2dLQ0FRRUExYTlRV2pPRU14RTFsZHRkWXN5SGdUdVJWdDV3bWNJVFRBcVdvNXIvYVJQdFZCZ04KYXJyeTVCbUxyaUtJaURGc3M4RlRMTUxNeEdWWkozNXlraWFhMmxHWkM2TmRseWtyM0hCZFhjNy9WdjkwcWlVNwpOU2NCMUdWeFFuS0g3QXV5ckxWMTlGemwvNVZDcmZHWlRKVklUd2RWNTFYdlZyTi9KbXd2c2l2MGdhVnhoSDNyCjJKZWU3NGlDUkNVcVNwR3BTenhUL1lQaUhibmZxMmpqREEyUitGQ0ovN3N3V21KemZ3NmhUY08xTFdaWHJyekwKRXZmZ29vcWV2dkVzcisycTBjZDc2djlJSDF5bFVSbk5kS1h5dDBSNTJoTlUzUVFyYThVTHIyb0xJNjJjWGtNSApWYi9PTktIMmVhdWhEQU5IVXpQTmdCTjY5SnRHbmtuV1hjbmJIUUlEQVFBQm8yRXdYekFPQmdOVkhROEJBZjhFCkJBTUNBcVF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0dBUVVGQndNQ01BOEdBMVVkRXdFQi93UUYKTUFNQkFmOHdIUVlEVlIwT0JCWUVGSVpxNmFCeXBHeWVXZjZ0Rk5EN3BpZzQ4TW9aTUEwR0NTcUdTSWIzRFFFQgpDd1VBQTRJQkFRQUlMSmY2ZlNSaTdwcEozZW9WMlg5RExZaTR1b2tuMjk5TVh0V2pIc3ZDYXY3bGhkb0VCcm55Cm9yWXRMelh1OUdTYlhsbmtTVldvUnlMVE9BMmJWQVpTRTZhK0h1dEVadFQ3RGNSYVg0cHJXZk5idzd5dWNzRmQKeFh2akh4VXBuN0t3VkhjNWlzc2JnUHJ4UlFESXlFVHJ2NkMwNXRBbWw4c0EySmgwWFZVb3Z5NjdrSGc0TENKMApKd3F1MGh6Z2pCYTd1NW4yZU9vRmJma3phK2syZEkyMUV0UHdiVExwK3lkdlljcjhZRGVISkVEdEFOV2o3WVYwClVJWFVFMkZyZXBzSXkzcXQzRGJZOGVPdmIxWGFHOXh1QkhGMlp5cTdxM0NvdXJIUVlTSzBZRmJNTGN4LzZXVDUKWERjUVExaVNOdnZuZzY2VDhCZk5lWkY3ZUVaMk0zNlMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWakNDQWo2Z0F3SUJBZ0lRVXgycEhjR09nYVZSMnJ2SS92czg2akFOQmdrcWhraUc5dzBCQVFzRkFEQVUKTVJJd0VBWURWUVFERXdsRGFXeHBkVzBnUTBFd0hoY05NalF4TWpFM01qRXhNVEl4V2hjTk1qY3hNakUzTWpFeApNVEl4V2pBcU1TZ3dKZ1lEVlFRRERCOHFMbVJsWm1GMWJIUXVhSFZpWW14bExXZHljR011WTJsc2FYVnRMbWx2Ck1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBMjZJZitmVCtiTmFxTUtyQUdGQzgKcWpiNERETWg3UWNCRHFjYWc1QWpmZmgrOVNsRnNwaGFPRmlQbW4rcEIwb05WczcxTHVwZlM5RHNZbUxnU3dqOApibmFpT3JwaFlhYnhBTFlnV2YreXMyOStxZmgyZCtnR3RHZG1LcThWRnlJMllMUkxGOThlZE91WWcxcTNFajFaCmZQYkxZekY5bVBVaWdIa2lLR3M1dU9OTUVpd0E1U0c2MW5xSzRoRE9XY25tL0lnQmx4Z1c1L0NZcE5ocGlSOE0KS1NaN2R1bUdiWDViUGdubVkxVitGd1llZ096Znp1cDNsMGE0c2pQUW80TlcrZHRnM1J2YWFsaWhuVnRuYlVBQgpOeVlJT1RFMGYrS1VaOEhFc2RxMnlqU2VpUFdXRW5LQ0syZVdicExrYlkreFVWTnhKVjdaMHlzbGpudXBNWnZ4CnRRSURBUUFCbzRHTk1JR0tNQTRHQTFVZER3RUIvd1FFQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0QKQVFZSUt3WUJCUVVIQXdJd0RBWURWUjBUQVFIL0JBSXdBREFmQmdOVkhTTUVHREFXZ0JTR2F1bWdjcVJzbmxuKwpyUlRRKzZZb09QREtHVEFxQmdOVkhSRUVJekFoZ2g4cUxtUmxabUYxYkhRdWFIVmlZbXhsTFdkeWNHTXVZMmxzCmFYVnRMbWx2TUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFDS3FTQ3ExeUdQcmlCZURKbDJoQ0h1RWhFQVVxUmMKTVZRaUNSLzlHa2hra0FnT3JtQjZqZmdneEpZaVdaU2wxVVNPQkZySUloYUhVdFVtUWwzTG9ZYWpyYm91UjlSNwo2NEI5MXdvL2lESUgveUh2dVFHU1R6YlZZMTlIRDlkWjdVMW5lenF6ZU41aS9MaEJWVEsyVjV4bVNVbTNPYUd3CjhwNHZOUjRIcURmY3JnOFNZbm84SEFPeEF1Z1dBRDU4WUczdUdQOUMyVTcrbitXZnkzajdHb0JUNnJYVGZLZWcKQjVnTUovaUVVM1F3aC9rcmFlUGFpczR0YSszUnRZRXJFZm9Yc1ZTa210aVpQSmZET00rV2RHQ3U3OEFLY3JhMQpybGdqUklnM3Z1U2p6ZmFISWZCZkRXR3k4VlBzd3drS2tPSks5b3JkYWNILzJwTzg0c0dackd6VQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-  tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBMjZJZitmVCtiTmFxTUtyQUdGQzhxamI0RERNaDdRY0JEcWNhZzVBamZmaCs5U2xGCnNwaGFPRmlQbW4rcEIwb05WczcxTHVwZlM5RHNZbUxnU3dqOGJuYWlPcnBoWWFieEFMWWdXZit5czI5K3FmaDIKZCtnR3RHZG1LcThWRnlJMllMUkxGOThlZE91WWcxcTNFajFaZlBiTFl6RjltUFVpZ0hraUtHczV1T05NRWl3QQo1U0c2MW5xSzRoRE9XY25tL0lnQmx4Z1c1L0NZcE5ocGlSOE1LU1o3ZHVtR2JYNWJQZ25tWTFWK0Z3WWVnT3pmCnp1cDNsMGE0c2pQUW80TlcrZHRnM1J2YWFsaWhuVnRuYlVBQk55WUlPVEUwZitLVVo4SEVzZHEyeWpTZWlQV1cKRW5LQ0syZVdicExrYlkreFVWTnhKVjdaMHlzbGpudXBNWnZ4dFFJREFRQUJBb0lCQUdSdWJsRE9Sc2xlSDlUQgpQN1hldFdiZ1creTROUHMrQ0syNm05VXRSQTJHWkFlWEo5ZlM4dTV4RUxtRlJyV2VseHJxNkJMYitWZWg0WFhiCjROUnU5MzlMb0VOYWxzMGdtWFBKMUdGVEcxUVIxOG5CWStyUW5zQS94K2djeDNnY25PRDdrSnNKMjlON0ovSm8KdU80T1A2MTA3T3dlNVYvY09EcW5LWWR5QUtNWjg2Q1QyWDQ1S3YvNDZtZlBnY0NwMjh3NVZZYURZODdNYVNQbApjQnp3cDhvUGk0d0xHM012SDAzZkZzc1RneXgrRk5zOGtQK3Y2VGh3czA4aUNrMWMzV3hUYVI4MnMvVnBodTZQCnRMajJLc3ZEL1lpWmNHZWxlR0ovZG44MXZMUEhSb2FUMVdmMmtDK1R2aDdHamRubjQ0aGZUSlN4Wi9UZ1BWUDMKTXVlL3JBRUNnWUVBMzJXQkFVWS9XU05mcTRMdGtXbWtTcTl6Tlk5NGxSeDlENm9wUWFxRG5ITmNndEoyVmo5VwpIME13MEhpWmZIeDNwbUJ2ZWtOTDhzK09MTkdUQTlDUTByQTU4ajlkV0ZTNzlsNVFMQTNXcWdVd2dpc0VEZy8xCnZvTCtTa0RUOENZQ2Z6aUQ0VXNTNFZ5ZU5GcDlEcExMRENBRVVoMzhMVHRqMWNTVDQ3YjlDTEVDZ1lFQSs3QUYKWk9IVmwza2VuR1NGSjhCWXdqNzFub1JWdjdFU0E5bmtzeUFSNVpLWmlmaFFhRjY1Z01GUjNyK1hxaUVKdmdicgpMcUhqNENXcjN4M1FqcVBlVlRFRmIwYjBWU1p4NjJxV2V0cTlYYjArMTBXYnlJZUZPNFBLZ2o1WnhteGxqL1RICjJTdmQvSnFLcXNVdWQyZkZuN2trMkZUbVV5YXN4dS9kRFQ2WXVrVUNnWUVBMlRGUmxGQ2M1R2djNnA1WHBRbkYKbm9zb0FzbmpYVzJlTlcybHdOOHNLQjZNc2ZBMjl6R0s1TWdwbkhXMEhERFREMkl3My9pdnpYbDM3Q0V4d3dLeQoydlJVMGk1QzdjOHNFNktzWmJocW5WQ0FVZjNLYW5XZjRjSnZ3dmQyVnNSTnB5em1JMU1mSHhZeUJncDREWVF3CmZ6QmRvd3plRVlmdFQzZFlwWXRTUlhFQ2dZRUExejRHcnVyUHpwVy9qd0lNT2gydUNwanJWMkJYTVBPT3M0cHgKb3BybmsweVhVRDN6RGY4TVo4ZHNhN0d3VThlalhFYndkRlh3MnExODJmZldkMVkrK3Q1TWhvakl4ZFYyRVYxNwpTWit0Mk8vU1FTbi9lelFpeGU0RWp2UWh0S2JaQ0k3UEpyUDBTV1lrOXJ4ZzY2N3NmSmRLb2xPaEVqVitCemYwCjlMRzJ6WDBDZ1lFQXVkOU1XU2NaYnpHVFFFSWMyZU1nbGFCZ3RoQktTdHVzdzQ5eTk3cGpRYlZIWWd3ZWdpOHIKRkZpY0JnR2pHRDYxVjJCRjB4OWhIYzhBY001Q0Q3SUQySnJ2VWJqbUlqc29BcXE3VG9LOVdOMHhtWXBkM3kxTwpSa3JpV2xYRjNtTXQrdjhaYWROc3JaVlhYVWErWDJIcmJhNEFDRUxjRmNTdHhIZWd3RU4rWUM0PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+  ca.crt:  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lRR0xyVkF4d2JnMkwybmpZMzM4Sk80VEFOQmdrcWhraUc5dzBCQVFzRkFEQVUKTVJJd0VBWURWUVFERXdsRGFXeHBkVzBnUTBFd0hoY05NalF4TWpJNE1UWXhPVEl4V2hjTk1qY3hNakk0TVRZeApPVEl4V2pBVU1SSXdFQVlEVlFRREV3bERhV3hwZFcwZ1EwRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCCkR3QXdnZ0VLQW9JQkFRRHFFcGx6R0ZhbUM5Nm03RWMwcnBONmh1b0hFbk13b2F6SVdzOWN2aWVuQmtlMHZXVU4KamF6Y1pWcHRYVGtMRjdMODE0dGNlb01yZUY2MHllVml5SDRWa3ZLcDYzaG5IM2hNNW4rNGF1enBLQnIzOWZZSQoxUVc1WW1icDhVdm84YWN3dEIvbzE5dFFtUUI1Sk9kdnJaU0lFci9aazNrVjVETXoxcHBhUGNhMUh5dThsSUxICldlZWR1aVdLdUxQYThGbkpzSG5GdFZKQmNMbzNQMm93T0JaNWdhUllSbUhVOER2L3VvUVBhOHRXY0VwTXJGcTYKb1hmMnZmQUFPcWJPeitpb2t5bHhCdG82SVRFb0ptUFdyVnNxbUh1STdXdzNVL0ZMRG0vVkJ0T1czYkVJMGdWdQptRERZODJYWFNmQmdPc1pRUnBVd2c3SHN4ZStLYTVzUkpCbG5BZ01CQUFHallUQmZNQTRHQTFVZER3RUIvd1FFCkF3SUNwREFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0R3WURWUjBUQVFIL0JBVXcKQXdFQi96QWRCZ05WSFE0RUZnUVV0ei9KUG1aM2tOQnZIcEJXOTc3Z1pwU21Mb1l3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFBZnpuVlF5OEIvYVZoRzlMdngxbHpjOEJUY3hScE5DSHhzek5nbk8zdGVmRnRSaFM4UkRuQzVmCm56d0czQWtZeTlqNnBjeHJteFZ1ZnpMZmdMUnI3eGNDd1hvUjVEYWM3WTZYaXJadzloRUwvQnI2UjBKR05mMjkKc2hGMlcvVjgxb1RqWXpzUmVTN0FJUHgxOXhVM0RQcjZCdlR6YVhReFl2aGN3V201Y1hvUmNBWkdXaWhqWVZaZgpydHQ0OWVhMkhDOUFwSFN0MXJGckgxRmMwekNQN29GV2JRZXNvOEtzYjZLWXpQK1RqeEpINVhJNld4N0x3ai9qCnlxK1hSeTU4eUo0TmRPN3JoYXBCVWdwUWRMMk9uQ256RmVFbFl2aWJQWUkwK2NEQjhwSHdLazhHQjgrYW5VQWkKb1FhdldTVnJHUG1xd2ltb3d3dmdoUDEyaVZhdDVEQT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWekNDQWorZ0F3SUJBZ0lSQUxNN3JNRVdXZWw2RG9UdVRaWUdneXd3RFFZSktvWklodmNOQVFFTEJRQXcKRkRFU01CQUdBMVVFQXhNSlEybHNhWFZ0SUVOQk1CNFhEVEkwTVRJeU9ERTJNVGt5TWxvWERUSTNNVEl5T0RFMgpNVGt5TWxvd0tqRW9NQ1lHQTFVRUF3d2ZLaTVrWldaaGRXeDBMbWgxWW1Kc1pTMW5jbkJqTG1OcGJHbDFiUzVwCmJ6Q0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQU9YZXpSZkZGVHcvVElvSWRzNE4KVGF0VTJIZjZGc0ROeDRsS2VhU1l3U21XUVpWWVlpa2x3aU1TTnlua3A5T3lISHRBRWoxWXdrdVk5SEl2d0tJWAo0ckg0RGpDUUI0cEFCOVo4aEhJNVZSRGhUQXkzUzFhUjRXUTBxMkF5cS94WmdtS0gxa1UvbUF1ajl5a09rdkNOClJjWUpqaVFvY2xtaVhTTUFrai9BNlF5cEdmUzZsNmJmYWZWbUdkV01waDA3b0VMNGNMejIwOVZwdUkzODRVT3cKVDJIdzRWVGRzc0F3Ui9GTnRza1YveCtKVkVPY2RZRExqaDZONkxVNWZWQ2d5anRVQ3hPYkZiYW5wRnQra3lIRQpkOU1jTTJoNDFwVE1kL0ovUGR0ZGVSNkNDVVc5VklhWE91cSs5L0dtMjl3M3FtTHdCS2xLMVFDMU5lTFBKWURKCllSY0NBd0VBQWFPQmpUQ0JpakFPQmdOVkhROEJBZjhFQkFNQ0JhQXdIUVlEVlIwbEJCWXdGQVlJS3dZQkJRVUgKQXdFR0NDc0dBUVVGQndNQ01Bd0dBMVVkRXdFQi93UUNNQUF3SHdZRFZSMGpCQmd3Rm9BVXR6L0pQbVoza05CdgpIcEJXOTc3Z1pwU21Mb1l3S2dZRFZSMFJCQ013SVlJZktpNWtaV1poZFd4MExtaDFZbUpzWlMxbmNuQmpMbU5wCmJHbDFiUzVwYnpBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQVkrbHVONlpUZEpEVUIvb1d1Tyt2SHR6SFNPVXcKYWVXMWN4eThFTk4xYUtDQWxZSG1rdG9nS21qU21pazlvM0lISm8wcWhqRWFUektTWllrZ0JvTHp6MGYyRC96VgpzUXE4RTk0YmxPUUorRG9wZlNXWUhVbWVVamFHMTl0TlNYdk9jOEZNYnJVUGpkYlVndFBlNXFsaHk2eW1FTlY2ClprNThOaVgxNDNEZnh4YW9wb0JEWmFXREdMOWgrSnBKTmNqNkcvSUQzb1h3TVEzakh4MGkydlUzL09tMHZwVHIKaWFyTnEvenZnRnhRLzdROGoxUmNIQnoyM0ZRVnNzeHNQK3QvTlNkV2JIMEwwV1lia2M2ZUpnL3g2REpSU0dzQwppNGFKV01zU0xZNTM4Q0RGVnM4QUtGb0ZHdHlYT3pRRHlvTW9pVTFmRndDa1hKR3plSkZFNHJTOGVRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+  tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBNWQ3TkY4VVZQRDlNaWdoMnpnMU5xMVRZZC9vV3dNM0hpVXA1cEpqQktaWkJsVmhpCktTWENJeEkzS2VTbjA3SWNlMEFTUFZqQ1M1ajBjaS9Bb2hmaXNmZ09NSkFIaWtBSDFueUVjamxWRU9GTURMZEwKVnBIaFpEU3JZREtyL0ZtQ1lvZldSVCtZQzZQM0tRNlM4STFGeGdtT0pDaHlXYUpkSXdDU1A4RHBES2taOUxxWApwdDlwOVdZWjFZeW1IVHVnUXZod3ZQYlQxV200amZ6aFE3QlBZZkRoVk4yeXdEQkg4VTIyeVJYL0g0bFVRNXgxCmdNdU9IbzNvdFRsOVVLREtPMVFMRTVzVnRxZWtXMzZUSWNSMzB4d3phSGpXbE14MzhuODkyMTE1SG9JSlJiMVUKaHBjNjZyNzM4YWJiM0RlcVl2QUVxVXJWQUxVMTRzOGxnTWxoRndJREFRQUJBb0lCQUhkd3huYVVaRTFTd3ExeQphbkQwZnFnSXhSWEtMK3Bzd2tKM0hTL0dZNC85VUFTTzBTcDZRUjdDQjBIUVd0Zm4wMTdEVXZibldNVzVLMEx0Cnh4VXlmZ3RsVGRJejlJY0VjRTRsa3hoYTYvV0NhMmFzRXd4ZmJwTUh2d2lVSzhOS3F6SVJUT2ZjZkYrSUNoUWUKUzRHTWxuV3BYMTh3V1FKMEdCcm80QlVhWXIyOVg3OW04a3p6UGtKRzVNYlFwQVhxNVNNN3FFblFpN1NhNzFiLwpwQjI4SC9OWVBHNVhPYVFnSVVZTW1OSHlsbTZaWlUyYmNJUjFubkROdjBUMFpmRUNsaFBIODEwVlB6OEsxYmlJCnhiT2tpdXpLTXFKaStQS1JHbDFIWUJtV1ZrWmYrNEs2Ny9hai8vQlNjeEsyRWJ1RmQ2ZFhDTmlZRmdha1h2YXgKbnVtZHlERUNnWUVBNlFZOVlWOGRUU1B5bzJCNXNCRkhIbGFFTzBMY2w3TTA3ZUo1WDJsb3lZK1JCN3IxYlpzRApPdm1zbHAwaVkwQ3NYckM1QjhxYWRwSXBkWERhRkRNb2Z1MFUwYjB6bXFINjJKUEVKa1d0Tnc3L0V3Y2FmWDZ2CjZ1NXpwNjB5ZFZvdFZjMzVRalNvMkRIRlZMSUptcjgrRHJTQ0g2QjZmaGc4Lzc1U05QOG5ia2tDZ1lFQS9JanoKTHBGajFPUjZKeTk0M1ZxNTRsWk1EWS9lRVIrdTE0Szg1WDFFeC9sVVp2bC9Vci9tT3lIUjFYTUJlZVdPSHpqRwpsdm9nelVrVDJqOG1nS0Njc2JWNnp1RVVHWDNOUWxxZXgra3hQTVdNZWJHVDZMY2g4dlhhazNHMkVnMTl1ZGhSCjNYVnoyNkNQOFlkdUFvUTAzSHcrVmhwemFvZ0R2RDRlZGNjNzFGOENnWUJDL2NrOXFoT0pidEU5eU9tVEJaU1YKa3pmV3RhVW5jNXkrMndJYnZQa2tJVU1IbnVjYUNKdUlJK2xMTDRlSVV6cDZ5b0dYVE5iVlNiWGpqbnNUblpXQgp6L1RSUzN4L2N4dmprYSt0ZFJDVUtKcUtSTnVId3BrZWlFajFwcVEvK3BuWDlpdzNyVjN4TVhYU29KQ0VUWUN3Cng1STFOM1NmdGFZcnUvSjBTL3B4Q1FLQmdEQkNTNWFlbWlGWStDNzgxM0FWb21ncWJhWTUxQW9acitQblRBbmYKQW9Ia2w4aUY3VnIyNlJ4cnZobTRQSlA2MWtvSkk0bytpbjR3ZE9iRUlxdDZCZmUvNHBRZVZ5VDM4WDI0cTVjdwpiUVJjREJoRll5cVp0SmNsZkh1b3cwNTMzWXJpVitLbVMxbXhPVkRDdkxjbVpLT3Q2b3V4eWxTVllZRmJyWjU4ClVHYXBBb0dCQUx6RDdNZGhQdzBGQnBMQ1c3QVhTd0h0L1lQWUFhZ0I3MmNydkM4MFR2WlFEa1lzTzZtUHBFVlQKT01kU0JTamlBRFJENXpWaUNFQ0R0TVY3V2dra0EzV2x1S0RWZDNFcnVveVJKWStKM3ZxSEp5K1NWTjBSWEh1UwpHUW9IZVQxMDY5OVNZYU5rT2JnT1BJTkZneTVtYW5yTUZsMGNKdmxoUHV4bUpuQVN4WThVCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
 ---
 # Source: cilium/templates/cilium-configmap.yaml
 apiVersion: v1
@@ -1307,6 +1307,8 @@ spec:
       tolerations:
         - key: node.kubernetes.io/not-ready
           operator: Exists
+        - key: node.cilium.io/agent-not-ready
+          operator: Exists
       volumes:
         # To read the configuration from the config map
       - name: cilium-config-path

test/e2e/cni/testdata/cilium/cilium-values.yaml

@@ -24,6 +24,8 @@ operator:
   tolerations:
     - key: node.kubernetes.io/not-ready
       operator: Exists
+    - key: node.cilium.io/agent-not-ready
+      operator: Exists
 ipam:
   mode: cluster-pool
 envoy:

test/e2e/cni/testdata/cilium/update-manifests.sh

@@ -49,6 +49,8 @@ operator:
   tolerations:
     - key: node.kubernetes.io/not-ready
       operator: Exists
+    - key: node.cilium.io/agent-not-ready
+      operator: Exists
 ipam:
   mode: cluster-pool
 envoy:

test/e2e/kubernetes/kubernetes.go

@@ -101,11 +101,13 @@ func WaitForHybridNodeToBeReady(ctx context.Context, k8s *kubernetes.Clientset,
 		}
 		consecutiveErrors = 0
 
-		if nodeReady(node) {
+		if !nodeReady(node) {
+			logger.Info("Node is not ready yet", "node", nodeName)
+		} else if !nodeCiliumAgentReady(node) {
+			logger.Info("Node's cilium-agent is not ready yet. Verify the cilium-operator is running.", "node", nodeName)
+		} else {
 			logger.Info("Node is ready", "node", nodeName)
 			return true, nil // node is ready, stop polling
-		} else {
-			logger.Info("Node is not ready yet", "node", nodeName)
 		}
 
 		return false, nil // continue polling
@@ -156,6 +158,15 @@ func nodeReady(node *corev1.Node) bool {
 	return false
 }
 
+func nodeCiliumAgentReady(node *corev1.Node) bool {
+	for _, taint := range node.Spec.Taints {
+		if taint.Key == "node.cilium.io/agent-not-ready" {
+			return false
+		}
+	}
+	return true
+}
+
 func GetNginxPodName(name string) string {
 	return "nginx-" + name
 }