CRI and containerd APIs disagree about the registry names - CRI supports
index.docker.io as an alias for docker.io, while containerd does not.
Use the actual stored RepoTag to determine what image to ask containerd for.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f099bfa508)
Don't clobber the providerID field and instance-type/region/zone labels if provided by the kubelet. This allows the user to set these to the correct values when using the embedded CCM in a real cloud environment.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 65cd606832)
Prevents joining nodes from being stuck with bad initial member list if there is a transient failure, or if they try to join themselves
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d7cdbb7d4d)
We were misreporting the flannel version as the flannel cni plugin version; restore the actual flannel version as build metadata
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6f331ea7b5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also, if NO_COLOR is empty, output will be colored, otherwise not colored.
Signed-off-by: Rishikesh Nair <alienware505@gmail.com>
(cherry picked from commit ce0765c9f8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Setting this environment variable will not wrap the text in color ANSI code, so that we can print a raw output.
Signed-off-by: Rishikesh Nair <alienware505@gmail.com>
(cherry picked from commit ff7cfa2235)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Add a e2e test that runs some demo WebAssembly applications
using the dedicated containerd shims.
Note: this is not an integration test because we need to install some
binaries (the special containerd shims) on the host.
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
(cherry picked from commit f82d438f39)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Fix the wasm shim detection and the containerd configuration generation.
Prior to this commit, the binary and the `RuntimeType` values were not
correct.
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
(cherry picked from commit 64e4f0e6e7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Moves us closer to using the proper upstream for our flannel CNI plugin, instead of the snapshot that is vendored into our plugins fork.
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 88d30f940d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* Set ServerNodeName in snapshot CLI setup
* Raise errer if ServerNodeName ends up empty some other way
* Fix status controller to use etcd node name annotation instead of prefix checking
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 82432a2df7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* Add both dual-stack addresses to the node hosts file
* Add hostname to hosts file as alias for node name to ensure consistent resolution
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit be569f65a9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Brad Davidson