Skip to content

Commit 0229df0

Browse files
cameronmeissnercameronmeissner
authored
fix(flatcar): ensure CREDENTIAL_PROVIDER_BIN_DIR before symlinking when installing azure-acr-credential-provider (#7933)
1 parent 625cc86 commit 0229df0

7 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎parts/linux/cloud-init/artifacts/flatcar/cse_install_flatcar.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ installKubeletKubectlFromBootstrapProfileRegistry() {
8686

8787
installCredentialProviderFromPkg() {
8888
if mergeSysexts azure-acr-credential-provider "${2:-mcr.microsoft.com}"/oss/v2/kubernetes/azure-acr-credential-provider-sysext "$1"; then
89+
mkdir -p "${CREDENTIAL_PROVIDER_BIN_DIR}"
90+
chown -R root:root "${CREDENTIAL_PROVIDER_BIN_DIR}"
8991
ln -snf /usr/bin/azure-acr-credential-provider "$CREDENTIAL_PROVIDER_BIN_DIR/acr-credential-provider"
9092
else
9193
installCredentialProviderFromUrl

‎pkg/agent/testdata/Flatcar+CustomCloud+USSec/CustomData‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/Flatcar+CustomCloud+USSec/CustomData.inner‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
{
8383
"contents": {
8484
"compression": "gzip",
85-
"source": "data:;base64,H4sIAAAAAAAC/6xWX2/aSBB/96eYuj6prW5xQnT30CoPaTAROkqQgeiqJLIcewyrLLu+3TVNSn2f/bRrMCaEtJzCC9J6ZnZ+f3Z2377x7yj372I1cxyli7t372HpAABgMhPgesvuZHA+OPsSXB/flmAiXKd0nFR840zE6ehR4YPuSjG/Qqmo4HU+E0nMQOEgnuOpd7y1Ngn7p167sbQu16Hy1FuefCSuL3Lte8sqv/TXAcotHZtHM3gDErV8TOZpRLMoiykrJMJx+wj+gD+PQMhYQV4wBoRInFKl5SNJBM/o1OC6DM9GURhc9Ebj8Gt0fjno9i6ibq8flC4QIgqdF9rENVorXbNg2y/dT6BnyG0vG7q6MWWYghY1IqgxgHpUGueADxq5oQoyKeZQF6xLSdSF5GarIAwj2+dw0u9Ho6+j4O9x1D3rraMz6jS0GhVJgpj+7/1Lx5nHOpn1jSSVsPvUhBQVlZheoTz12qDwTCazU+/ExuaScp2B+5u64S7sVXKzRhbeclOwdK9b/5LbDy4xAaZw2ZLxNxd+gBJSA7mCH6BjyoDw47rpEOdC456urd9ebrq2kqIMuV7ZqL2ykcRcgI6n6nAvbRwDP2AqMQcSPIC7Bdn3W/7NTau0wFsfSPydUV48nGwY2IPedK5RafCWw94wGI3PxpPR9dFtCQT/gSPLDsrpihe1Q4ypbRfWZLyboh5Zn6Rm4X3lr28zyhCuDZZjUrpw+wlSUfv1qTfW53uL7xNQ+MUI5dR5q4VT791T21WkWW9YApvmqL5VpLyva9lxYJkgWRVha+8c0+eOakZ5CouY0ZcPi5Cw1UmFmz26zlb1J6iavmx64ZdQrZBdA/m+BcoIsAPrNaFJ27XB9nSHXx9O6996SG1Jtff+eCp9xdfHlxV9ncZe04+HevI1xYszjbJmmPLpK6n4HG+MA1F8Gx64PurEr1tsTHo7yDcDYEYzDdX8TQXHqmyFMCWqop4QLohEe5dJzCSqmRlrlCsdM9bBfDPVzOuk8e1c0nPNhnFyH09xX9BfxR0y1OYv0cwYcXg/rYNpBs35CfdVtIHb/kjmiWzNaSKFEpluJWJeur5Qyl+0fRMoOWpU/ipnjcf1jl242VHE/O6rJg6unmjWrP7EXmuJ/EJJ+9hbrjr6fZVbgr2izafqNcEUbgbrPpomYX/9BnmJzc9CaKVlnA+lyCjDcHV7bih+QQdwvbZrMW3JiilyTWM2lGJBU5Q/Uy3+XkgkcSJJUueSfJV8ENsvVjpEg5+1dB4GnWAw7p31o2F4edXrBGH0uTeIOr3Q35Pl7hXvecYmku0KuBu6Oj+HaLlXoW09katCYljwZOdwmvtngYMFTWkcYi52z3jCMOaT/GI46Ui6QLmJkHMgYQbexXASdYLRuHL3NC8aMMdCWI/ZGW822K7fGJH2hfk2uOw6/wUAAP//H/OzwisNAAA="
85+
"source": "data:;base64,H4sIAAAAAAAC/6xWX2/iOBB/z6eYzeak3dWZtFR3D131oVugQsdSFKC6VVuhNJmAVcfO2Q5tl8199pMdCAEWtj2Vh1ZyZsbz++Ox37/z7yn370M1cxyl8/sPH2HhAABgNBPgeovOuH/RP//avjm+K8BEuE7hOLF45EyE8fBZ4ZPuSJFeo1RU8CqfiShkoLAfpnjmHW+sjYPemdesLa3Ktag88xYnp8T1RaZ9b1HmF/4qQLmFY/NoAu9AopbPURpPaDJJQspyiXDcPII/4M8jEDJUkOWMASESp1Rp+UwiwRM6NbiugvPhJGhfdoej4Nvk4qrf6V5OOt1eu3CBEJHrLNcmrtZa4ZoF237hfgY9Q257WdPVCSnDGLSoEEGFAdSz0pgCPmnkhipIpEihKliVkqhzyc1W7SCY2D4H415vMvw2bP89mnTOu6vohDo1rYZ5FCHG/3v/wnHSUEeznpGkFHafmhCjohLja5RnXhMUnstoduad2NhMUq4TcH9Tt9yFvUqu18jcW6wLFu5N419y98klJsAULhoyfHThByghNZBr+AE6pAwIP66aDjAVGvd0bf12uOnKSooy5Hppo+bSRhIzATqcqtd7ae0Y+AFTiRmQ9hO4G5B9v+Hf3jYKC7zxiYTfGeX508magT3oTecalQZvMegO2sPR+Wg8vDm6K4DgP3Bk2UE5XfKidogxte3CiowPU9RD65PYLHws/fU4owzhxmA5JoULd58hFpVft72xOt8bfJ+Awq9GKKfKWy6ceR+2bVeSZr1hCaybo/xWkvKxqmXHgWWCJGWErb1zTH92VBPKY5iHjB4+LELCRiclbvbsOhvVt1DVfVn3wotQLZHdAPm+AcoIsAPrLaFJ27XBtr3Dy4fT6rcaUhtS7b0/tqUv+To9rOjbNPaWfnytJ99SvDDRKCuGKZ++kYo/441xIIpvwgPXRx35VYu1SW8H+XoAzGiioZy/seBYli0RxkSV1BPCBZFo7zKJiUQ1M2ONcqVDxlqYraeaeZ3Uvl1IeqHZIIwewinuC/orv0eG2vyLNDNGHDxMq2CaQH1+wkMZbeA2T0kayUZKIymUSHQjEmnh+kIpf970TaDkqFH5y5wVHtc7duF2RxHzeyibeHX1SLN69S17rSTycyXtY2+x7Oj3ZW4B9oo2n8rXBFO4Hqz7aBoHvdUb5BCbX4TQSsswG0iRUIbB8vZcU3xAB3C9pmsxbciKMXJNQzaQYk5jlL9SLfyeSyRhJElU5ZJsmfwqtg9WOqBB+hBTCSQzm10E7Va7P+qe9yaD4Oq622oHky/d/qTVDWpnLpqJRw4kACmEPjV/Xp67o/ivCDhQ1t+T5e61ys/1GUu2a5fd0OVpfY1z9vph0z3IVS4xyHm0MwrMbTfH/pzGNAwwE7sTJWIY8nF2ORi3JJ2jXEfIFEiQgHc5GE9a7eGoPEvTLK/BHAlhHW1vFLPBZv3aQLbv2fftq47zXwAAAP//qwxxCZkNAAA="
8686
},
8787
"mode": 484,
8888
"overwrite": true,

‎pkg/agent/testdata/Flatcar+CustomCloud/CustomData‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/Flatcar+CustomCloud/CustomData.inner‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
{
8383
"contents": {
8484
"compression": "gzip",
85-
"source": "data:;base64,H4sIAAAAAAAC/6xWX2/aSBB/96eYuj6prW5xQnT30CoPaTAROkqQgeiqJLIcewyrLLu+3TVNSn2f/bRrMCaEtJzCC9J6ZnZ+f3Z2377x7yj372I1cxyli7t372HpAABgMhPgesvuZHA+OPsSXB/flmAiXKd0nFR840zE6ehR4YPuSjG/Qqmo4HU+E0nMQOEgnuOpd7y1Ngn7p167sbQu16Hy1FuefCSuL3Lte8sqv/TXAcotHZtHM3gDErV8TOZpRLMoiykrJMJx+wj+gD+PQMhYQV4wBoRInFKl5SNJBM/o1OC6DM9GURhc9Ebj8Gt0fjno9i6ibq8flC4QIgqdF9rENVorXbNg2y/dT6BnyG0vG7q6MWWYghY1IqgxgHpUGueADxq5oQoyKeZQF6xLSdSF5GarIAwj2+dw0u9Ho6+j4O9x1D3rraMz6jS0GhVJgpj+7/1Lx5nHOpn1jSSVsPvUhBQVlZheoTz12qDwTCazU+/ExuaScp2B+5u64S7sVXKzRhbeclOwdK9b/5LbDy4xAaZw2ZLxNxd+gBJSA7mCH6BjyoDw47rpEOdC456urd9ebrq2kqIMuV7ZqL2ykcRcgI6n6nAvbRwDP2AqMQcSPIC7Bdn3W/7NTau0wFsfSPydUV48nGwY2IPedK5RafCWw94wGI3PxpPR9dFtCQT/gSPLDsrpihe1Q4ypbRfWZLyboh5Zn6Rm4X3lr28zyhCuDZZjUrpw+wlSUfv1qTfW53uL7xNQ+MUI5dR5q4VT791T21WkWW9YApvmqL5VpLyva9lxYJkgWRVha+8c0+eOakZ5CouY0ZcPi5Cw1UmFmz26zlb1J6iavmx64ZdQrZBdA/m+BcoIsAPrNaFJ27XB9nSHXx9O6996SG1Jtff+eCp9xdfHlxV9ncZe04+HevI1xYszjbJmmPLpK6n4HG+MA1F8Gx64PurEr1tsTHo7yDcDYEYzDdX8TQXHqmyFMCWqop4QLohEe5dJzCSqmRlrlCsdM9bBfDPVzOuk8e1c0nPNhnFyH09xX9BfxR0y1OYv0cwYcXg/rYNpBs35CfdVtIHb/kjmiWzNaSKFEpluJWJeur5Qyl+0fRMoOWpU/ipnjcf1jl242VHE/O6rJg6unmjWrP7EXmuJ/EJJ+9hbrjr6fZVbgr2izafqNcEUbgbrPpomYX/9BnmJzc9CaKVlnA+lyCjDcHV7bih+QQdwvbZrMW3JiilyTWM2lGJBU5Q/Uy3+XkgkcSJJUueSfJV8ENsvVjpEg5+1dB4GnWAw7p31o2F4edXrBGH0uTeIOr3Q35Pl7hXvecYmku0KuBu6Oj+HaLlXoW09katCYljwZOdwmvtngYMFTWkcYi52z3jCMOaT/GI46Ui6QLmJkHMgYQbexXASdYLRuHL3NC8aMMdCWI/ZGW822K7fGJH2hfk2uOw6/wUAAP//H/OzwisNAAA="
85+
"source": "data:;base64,H4sIAAAAAAAC/6xWX2/iOBB/z6eYzeak3dWZtFR3D131oVugQsdSFKC6VVuhNJmAVcfO2Q5tl8199pMdCAEWtj2Vh1ZyZsbz++Ox37/z7yn370M1cxyl8/sPH2HhAABgNBPgeovOuH/RP//avjm+K8BEuE7hOLF45EyE8fBZ4ZPuSJFeo1RU8CqfiShkoLAfpnjmHW+sjYPemdesLa3Ktag88xYnp8T1RaZ9b1HmF/4qQLmFY/NoAu9AopbPURpPaDJJQspyiXDcPII/4M8jEDJUkOWMASESp1Rp+UwiwRM6NbiugvPhJGhfdoej4Nvk4qrf6V5OOt1eu3CBEJHrLNcmrtZa4ZoF237hfgY9Q257WdPVCSnDGLSoEEGFAdSz0pgCPmnkhipIpEihKliVkqhzyc1W7SCY2D4H415vMvw2bP89mnTOu6vohDo1rYZ5FCHG/3v/wnHSUEeznpGkFHafmhCjohLja5RnXhMUnstoduad2NhMUq4TcH9Tt9yFvUqu18jcW6wLFu5N419y98klJsAULhoyfHThByghNZBr+AE6pAwIP66aDjAVGvd0bf12uOnKSooy5Hppo+bSRhIzATqcqtd7ae0Y+AFTiRmQ9hO4G5B9v+Hf3jYKC7zxiYTfGeX508magT3oTecalQZvMegO2sPR+Wg8vDm6K4DgP3Bk2UE5XfKidogxte3CiowPU9RD65PYLHws/fU4owzhxmA5JoULd58hFpVft72xOt8bfJ+Awq9GKKfKWy6ceR+2bVeSZr1hCaybo/xWkvKxqmXHgWWCJGWErb1zTH92VBPKY5iHjB4+LELCRiclbvbsOhvVt1DVfVn3wotQLZHdAPm+AcoIsAPrLaFJ27XBtr3Dy4fT6rcaUhtS7b0/tqUv+To9rOjbNPaWfnytJ99SvDDRKCuGKZ++kYo/441xIIpvwgPXRx35VYu1SW8H+XoAzGiioZy/seBYli0RxkSV1BPCBZFo7zKJiUQ1M2ONcqVDxlqYraeaeZ3Uvl1IeqHZIIwewinuC/orv0eG2vyLNDNGHDxMq2CaQH1+wkMZbeA2T0kayUZKIymUSHQjEmnh+kIpf970TaDkqFH5y5wVHtc7duF2RxHzeyibeHX1SLN69S17rSTycyXtY2+x7Oj3ZW4B9oo2n8rXBFO4Hqz7aBoHvdUb5BCbX4TQSsswG0iRUIbB8vZcU3xAB3C9pmsxbciKMXJNQzaQYk5jlL9SLfyeSyRhJElU5ZJsmfwqtg9WOqBB+hBTCSQzm10E7Va7P+qe9yaD4Oq622oHky/d/qTVDWpnLpqJRw4kACmEPjV/Xp67o/ivCDhQ1t+T5e61ys/1GUu2a5fd0OVpfY1z9vph0z3IVS4xyHm0MwrMbTfH/pzGNAwwE7sTJWIY8nF2ORi3JJ2jXEfIFEiQgHc5GE9a7eGoPEvTLK/BHAlhHW1vFLPBZv3aQLbv2fftq47zXwAAAP//qwxxCZkNAAA="
8686
},
8787
"mode": 484,
8888
"overwrite": true,

‎pkg/agent/testdata/Flatcar/CustomData‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/Flatcar/CustomData.inner‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
{
8383
"contents": {
8484
"compression": "gzip",
85-
"source": "data:;base64,H4sIAAAAAAAC/6xWX2/aSBB/96eYuj6prW5xQnT30CoPaTAROkqQgeiqJLIcewyrLLu+3TVNSn2f/bRrMCaEtJzCC9J6ZnZ+f3Z2377x7yj372I1cxyli7t372HpAABgMhPgesvuZHA+OPsSXB/flmAiXKd0nFR840zE6ehR4YPuSjG/Qqmo4HU+E0nMQOEgnuOpd7y1Ngn7p167sbQu16Hy1FuefCSuL3Lte8sqv/TXAcotHZtHM3gDErV8TOZpRLMoiykrJMJx+wj+gD+PQMhYQV4wBoRInFKl5SNJBM/o1OC6DM9GURhc9Ebj8Gt0fjno9i6ibq8flC4QIgqdF9rENVorXbNg2y/dT6BnyG0vG7q6MWWYghY1IqgxgHpUGueADxq5oQoyKeZQF6xLSdSF5GarIAwj2+dw0u9Ho6+j4O9x1D3rraMz6jS0GhVJgpj+7/1Lx5nHOpn1jSSVsPvUhBQVlZheoTz12qDwTCazU+/ExuaScp2B+5u64S7sVXKzRhbeclOwdK9b/5LbDy4xAaZw2ZLxNxd+gBJSA7mCH6BjyoDw47rpEOdC456urd9ebrq2kqIMuV7ZqL2ykcRcgI6n6nAvbRwDP2AqMQcSPIC7Bdn3W/7NTau0wFsfSPydUV48nGwY2IPedK5RafCWw94wGI3PxpPR9dFtCQT/gSPLDsrpihe1Q4ypbRfWZLyboh5Zn6Rm4X3lr28zyhCuDZZjUrpw+wlSUfv1qTfW53uL7xNQ+MUI5dR5q4VT791T21WkWW9YApvmqL5VpLyva9lxYJkgWRVha+8c0+eOakZ5CouY0ZcPi5Cw1UmFmz26zlb1J6iavmx64ZdQrZBdA/m+BcoIsAPrNaFJ27XB9nSHXx9O6996SG1Jtff+eCp9xdfHlxV9ncZe04+HevI1xYszjbJmmPLpK6n4HG+MA1F8Gx64PurEr1tsTHo7yDcDYEYzDdX8TQXHqmyFMCWqop4QLohEe5dJzCSqmRlrlCsdM9bBfDPVzOuk8e1c0nPNhnFyH09xX9BfxR0y1OYv0cwYcXg/rYNpBs35CfdVtIHb/kjmiWzNaSKFEpluJWJeur5Qyl+0fRMoOWpU/ipnjcf1jl242VHE/O6rJg6unmjWrP7EXmuJ/EJJ+9hbrjr6fZVbgr2izafqNcEUbgbrPpomYX/9BnmJzc9CaKVlnA+lyCjDcHV7bih+QQdwvbZrMW3JiilyTWM2lGJBU5Q/Uy3+XkgkcSJJUueSfJV8ENsvVjpEg5+1dB4GnWAw7p31o2F4edXrBGH0uTeIOr3Q35Pl7hXvecYmku0KuBu6Oj+HaLlXoW09katCYljwZOdwmvtngYMFTWkcYi52z3jCMOaT/GI46Ui6QLmJkHMgYQbexXASdYLRuHL3NC8aMMdCWI/ZGW822K7fGJH2hfk2uOw6/wUAAP//H/OzwisNAAA="
85+
"source": "data:;base64,H4sIAAAAAAAC/6xWX2/iOBB/z6eYzeak3dWZtFR3D131oVugQsdSFKC6VVuhNJmAVcfO2Q5tl8199pMdCAEWtj2Vh1ZyZsbz++Ox37/z7yn370M1cxyl8/sPH2HhAABgNBPgeovOuH/RP//avjm+K8BEuE7hOLF45EyE8fBZ4ZPuSJFeo1RU8CqfiShkoLAfpnjmHW+sjYPemdesLa3Ktag88xYnp8T1RaZ9b1HmF/4qQLmFY/NoAu9AopbPURpPaDJJQspyiXDcPII/4M8jEDJUkOWMASESp1Rp+UwiwRM6NbiugvPhJGhfdoej4Nvk4qrf6V5OOt1eu3CBEJHrLNcmrtZa4ZoF237hfgY9Q257WdPVCSnDGLSoEEGFAdSz0pgCPmnkhipIpEihKliVkqhzyc1W7SCY2D4H415vMvw2bP89mnTOu6vohDo1rYZ5FCHG/3v/wnHSUEeznpGkFHafmhCjohLja5RnXhMUnstoduad2NhMUq4TcH9Tt9yFvUqu18jcW6wLFu5N419y98klJsAULhoyfHThByghNZBr+AE6pAwIP66aDjAVGvd0bf12uOnKSooy5Hppo+bSRhIzATqcqtd7ae0Y+AFTiRmQ9hO4G5B9v+Hf3jYKC7zxiYTfGeX508magT3oTecalQZvMegO2sPR+Wg8vDm6K4DgP3Bk2UE5XfKidogxte3CiowPU9RD65PYLHws/fU4owzhxmA5JoULd58hFpVft72xOt8bfJ+Awq9GKKfKWy6ceR+2bVeSZr1hCaybo/xWkvKxqmXHgWWCJGWErb1zTH92VBPKY5iHjB4+LELCRiclbvbsOhvVt1DVfVn3wotQLZHdAPm+AcoIsAPrLaFJ27XBtr3Dy4fT6rcaUhtS7b0/tqUv+To9rOjbNPaWfnytJ99SvDDRKCuGKZ++kYo/441xIIpvwgPXRx35VYu1SW8H+XoAzGiioZy/seBYli0RxkSV1BPCBZFo7zKJiUQ1M2ONcqVDxlqYraeaeZ3Uvl1IeqHZIIwewinuC/orv0eG2vyLNDNGHDxMq2CaQH1+wkMZbeA2T0kayUZKIymUSHQjEmnh+kIpf970TaDkqFH5y5wVHtc7duF2RxHzeyibeHX1SLN69S17rSTycyXtY2+x7Oj3ZW4B9oo2n8rXBFO4Hqz7aBoHvdUb5BCbX4TQSsswG0iRUIbB8vZcU3xAB3C9pmsxbciKMXJNQzaQYk5jlL9SLfyeSyRhJElU5ZJsmfwqtg9WOqBB+hBTCSQzm10E7Va7P+qe9yaD4Oq622oHky/d/qTVDWpnLpqJRw4kACmEPjV/Xp67o/ivCDhQ1t+T5e61ys/1GUu2a5fd0OVpfY1z9vph0z3IVS4xyHm0MwrMbTfH/pzGNAwwE7sTJWIY8nF2ORi3JJ2jXEfIFEiQgHc5GE9a7eGoPEvTLK/BHAlhHW1vFLPBZv3aQLbv2fftq47zXwAAAP//qwxxCZkNAAA="
8686
},
8787
"mode": 484,
8888
"overwrite": true,

0 commit comments

Comments
 (0)