Merge pull request #3042 from rpkelly/1.13.x

[1.13.x] Cherrypicks for 1.13.4

README.md

@@ -522,6 +522,18 @@ For Kubernetes variants in AWS, the following settings are set for you automatic
 
 * `settings.kubernetes.cluster-dns-ip`: Derived from the EKS Service IP CIDR or the CIDR block of the primary network interface.
 * `settings.kubernetes.max-pods`: The maximum number of pods that can be scheduled on this node (limited by number of available IPv4 addresses)
+* `settings.kubernetes.hostname-override`: The node name kubelet uses as identification instead of the hostname or the name determined by the in-tree cloud provider if that's enabled.
+
+  **Important note for all Kubernetes variants:** Changing this setting at runtime (not via user-data) can cause issues with kubelet registration, as hostname is closely tied to the identity of the system for both registration and certificates/authorization purposes.
+
+  Most users don't need to change this setting.
+  If left unset, the system hostname will be used instead.
+  The `settings.network.hostname` setting can be used to specify the value for both `kubelet` and the host.
+  Only set this override if you intend for the `kubelet` to register with a different name than the host.
+
+  For `aws-k8s-1.26` variants, which use the "external" cloud provider, a hostname override will be automatically generated by querying the EC2 API for the private DNS name of the instance.
+  This is done for backwards compatibility with the deprecated "aws" cloud provider, which adjusted the hostname in a similar way.
+  Future `aws-k8s-*` variants may remove this behavior.
 
 #### Amazon ECS settings
 

Release.toml

@@ -1,4 +1,4 @@
-version = "1.13.3"
+version = "1.13.4"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -196,3 +196,7 @@ version = "1.13.3"
 "(1.13.2, 1.13.3)" = [
     "migrate_v1.13.3_aws-k8s-provider-id-gen.lz4",
 ]
+"(1.13.3, 1.13.4)" = [
+    "migrate_v1.13.4_add-hostname-override.lz4",
+    "migrate_v1.13.4_add-hostname-override-metadata.lz4",
+]

packages/kubernetes-1.22/kubelet-exec-start-conf

@@ -22,6 +22,9 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-bin-dir /usr/libexec/kubernetes/kubelet/plugins \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
+{{/if}}
+{{#if settings.kubernetes.hostname-override}}
+    --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \

packages/kubernetes-1.23/kubelet-exec-start-conf

@@ -22,6 +22,9 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-bin-dir /usr/libexec/kubernetes/kubelet/plugins \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
+{{/if}}
+{{#if settings.kubernetes.hostname-override}}
+    --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \

packages/kubernetes-1.24/kubelet-exec-start-conf

@@ -21,6 +21,9 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-bin-dir /usr/libexec/kubernetes/kubelet/plugins \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
+{{/if}}
+{{#if settings.kubernetes.hostname-override}}
+    --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \

packages/kubernetes-1.25/kubelet-exec-start-conf

@@ -21,6 +21,9 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-bin-dir /usr/libexec/kubernetes/kubelet/plugins \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
+{{/if}}
+{{#if settings.kubernetes.hostname-override}}
+    --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \

packages/kubernetes-1.26/kubelet-exec-start-conf

@@ -2,11 +2,7 @@
 ExecStart=
 ExecStart=/usr/bin/kubelet \
 {{#unless settings.kubernetes.standalone-mode}}
-{{#if (eq settings.kubernetes.cloud-provider "\"\"")}}
-    --cloud-provider "" \
-{{else}}
-    --cloud-provider "external" \
-{{/if}}
+    --cloud-provider {{default "external" settings.kubernetes.cloud-provider}} \
     --kubeconfig /etc/kubernetes/kubelet/kubeconfig \
 {{#if (eq settings.kubernetes.authentication-mode "tls")}}
     --bootstrap-kubeconfig /etc/kubernetes/kubelet/bootstrap-kubeconfig \
@@ -25,6 +21,9 @@ ExecStart=/usr/bin/kubelet \
     --image-credential-provider-bin-dir /usr/libexec/kubernetes/kubelet/plugins \
     --image-credential-provider-config /etc/kubernetes/kubelet/credential-provider-config.yaml \
 {{/if}}
+{{/if}}
+{{#if settings.kubernetes.hostname-override}}
+    --hostname-override {{settings.kubernetes.hostname-override}} \
 {{/if}}
     --node-ip ${NODE_IP} \
     --node-labels "${NODE_LABELS}" \

packages/runc/Cargo.toml

@@ -12,9 +12,9 @@ path = "pkg.rs"
 releases-url = "https://github.com/opencontainers/runc/releases/"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.tar.xz"
-path = "runc-v1.1.5.tar.xz"
-sha512 = "7b10c0d6739e7fe3c718b3219bdb2437ae3ed8d1995b88136b9a0e8b4e909adbe8b6af6634a751b507bf793d0d5e924f5c85525d8fd46c3daf72c664dc25ab04"
+url = "https://github.com/opencontainers/runc/releases/download/v1.1.6/runc.tar.xz"
+path = "runc-v1.1.6.tar.xz"
+sha512 = "a5b799cb5a69f7251f81e5887a9269fb8fc6573b8a7d1b2e2436a0955feea982a34cf0bc62017534fdbc75e37fa70db4a06bdaecc6e67140fb094d06642a8440"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

packages/runc/runc.spec

@@ -1,8 +1,8 @@
 %global goproject github.com/opencontainers
 %global gorepo runc
 %global goimport %{goproject}/%{gorepo}
-%global commit f19387a6bec4944c770f7668ab51c4348d9c2f38
-%global gover 1.1.5
+%global commit 0f48801a0e21e3f0bc4e74643ead2a502df4818d
+%global gover 1.1.6
 
 %global _dwz_low_mem_die_limit 0