From 02a2eefe62fae0d2f3611ac461743a07f0eec834 Mon Sep 17 00:00:00 2001 From: Tianhao Geng Date: Wed, 29 Nov 2023 23:50:52 +0000 Subject: [PATCH 1/2] Add kubernetes-1.29 package and variants This adds a k8s-1.29 package. Existing 1.28 models are moved to be 1.29, with symlinks created for 1.28 models to point to the new locations. Finally, new variants are defined for aws-k8s-1.29, aws-k8s-1.29-nvidia, metal-k8s-1.29, and vmware-k8s-1.29. --- README.md | 4 + packages/kubernetes-1.29/Cargo.toml | 32 +++ packages/kubernetes-1.29/clarify.toml | 62 ++++++ .../credential-provider-config-yaml | 38 ++++ .../kubernetes-1.29/dockershim-symlink.conf | 2 + .../etc-kubernetes-pki-private.mount | 16 ++ .../kubelet-bootstrap-kubeconfig | 25 +++ packages/kubernetes-1.29/kubelet-config | 183 ++++++++++++++++++ packages/kubernetes-1.29/kubelet-env | 8 + .../kubernetes-1.29/kubelet-exec-start-conf | 37 ++++ packages/kubernetes-1.29/kubelet-kubeconfig | 43 ++++ packages/kubernetes-1.29/kubelet-server-crt | 7 + packages/kubernetes-1.29/kubelet-server-key | 7 + packages/kubernetes-1.29/kubelet-sysctl.conf | 2 + packages/kubernetes-1.29/kubelet.service | 26 +++ packages/kubernetes-1.29/kubernetes-1.29.spec | 164 ++++++++++++++++ packages/kubernetes-1.29/kubernetes-ca-crt | 7 + .../kubernetes-1.29/kubernetes-tmpfiles.conf | 5 + packages/kubernetes-1.29/logdog.kubelet.conf | 3 + .../kubernetes-1.29/make-kubelet-dirs.conf | 5 + .../prepare-var-lib-kubelet.service | 23 +++ .../prestart-pull-pause-ctr.conf | 9 + sources/models/README.md | 70 ++++--- sources/models/src/aws-k8s-1.28 | 1 + sources/models/src/aws-k8s-1.28-nvidia | 1 + .../defaults.d/10-defaults.toml | 0 .../defaults.d/15-aws-tuf.toml | 0 .../defaults.d/20-aws-host-containers.toml | 0 .../defaults.d/25-cf-signal.toml | 0 .../defaults.d/26-aws-autoscaling.toml | 0 .../defaults.d/30-metrics.toml | 0 .../defaults.d/31-send-metrics-aws.toml | 0 .../defaults.d/40-aws-creds.toml | 0 .../defaults.d/50-kubernetes-aws.toml | 0 .../51-kubernetes-containerd-nvidia.toml | 0 .../defaults.d/52-kubernetes-services.toml | 0 .../defaults.d/53-containerd-cri-pki.toml | 0 ...ubernetes-aws-external-cloud-provider.toml | 0 ...55-kubernetes-aws-credential-provider.toml | 0 .../56-kubernetes-seccomp-default-false.toml | 0 .../defaults.d/60-lockdown-none.toml | 0 .../defaults.d/70-oci-hooks.toml | 0 .../75-oci-defaults-containerd-cri.toml | 0 .../76-oci-defaults-capabilities.toml | 0 ...faults-containerd-cri-resource-limits.toml | 0 .../defaults.d/90-boot.toml | 0 .../mod.rs | 0 .../defaults.d/10-defaults.toml | 0 .../defaults.d/15-aws-tuf.toml | 0 .../defaults.d/20-aws-host-containers.toml | 0 .../defaults.d/25-cf-signal.toml | 0 .../defaults.d/26-aws-autoscaling.toml | 0 .../defaults.d/30-metrics.toml | 0 .../defaults.d/31-send-metrics-aws.toml | 0 .../defaults.d/40-aws-creds.toml | 0 .../defaults.d/50-kubernetes-aws.toml | 0 .../defaults.d/51-kubernetes-containerd.toml | 0 .../defaults.d/52-kubernetes-services.toml | 0 .../defaults.d/53-containerd-cri-pki.toml | 0 ...ubernetes-aws-external-cloud-provider.toml | 0 ...55-kubernetes-aws-credential-provider.toml | 0 .../56-kubernetes-seccomp-default-false.toml | 0 .../defaults.d/60-lockdown-integrity.toml | 0 .../defaults.d/70-oci-hooks.toml | 0 .../75-oci-defaults-containerd-cri.toml | 0 .../76-oci-defaults-capabilities.toml | 0 ...faults-containerd-cri-resource-limits.toml | 0 .../defaults.d/90-boot.toml | 0 .../src/{aws-k8s-1.28 => aws-k8s-1.29}/mod.rs | 0 sources/models/src/lib.rs | 70 ++++--- sources/models/src/metal-k8s-1.28 | 1 + .../defaults.d/10-defaults.toml | 0 .../defaults.d/15-public-tuf.toml | 0 .../defaults.d/20-public-host-containers.toml | 0 .../defaults.d/30-metrics.toml | 0 .../defaults.d/31-send-metrics.toml | 0 .../defaults.d/40-aws-creds.toml | 0 .../defaults.d/50-kubernetes-metal.toml | 0 .../defaults.d/51-kubernetes-containerd.toml | 0 .../defaults.d/52-kubernetes-services.toml | 0 .../defaults.d/53-containerd-cri-pki.toml | 0 .../54-kubernetes-seccomp-default-false.toml | 0 .../defaults.d/60-lockdown-integrity.toml | 0 .../defaults.d/70-public-ntp.toml | 0 .../defaults.d/80-oci-hooks.toml | 0 .../85-oci-defaults-containerd-cri.toml | 0 .../86-oci-defaults-capabilities.toml | 0 ...faults-containerd-cri-resource-limits.toml | 0 .../defaults.d/90-boot.toml | 0 .../{metal-k8s-1.28 => metal-k8s-1.29}/mod.rs | 0 sources/models/src/vmware-k8s-1.28 | 1 + .../defaults.d/10-defaults.toml | 0 .../defaults.d/15-public-tuf.toml | 0 .../defaults.d/20-public-host-containers.toml | 0 .../defaults.d/30-metrics.toml | 0 .../defaults.d/31-send-metrics.toml | 0 .../defaults.d/40-aws-creds.toml | 0 .../defaults.d/50-kubernetes-vmware.toml | 0 .../defaults.d/51-kubernetes-containerd.toml | 0 .../defaults.d/52-kubernetes-services.toml | 0 .../defaults.d/53-containerd-cri-pki.toml | 0 .../54-kubernetes-seccomp-default-false.toml | 0 .../defaults.d/60-lockdown-integrity.toml | 0 .../defaults.d/70-public-ntp.toml | 0 .../75-oci-defaults-containerd-cri.toml | 0 .../76-oci-defaults-capabilities.toml | 0 ...faults-containerd-cri-resource-limits.toml | 0 .../defaults.d/80-oci-hooks.toml | 0 .../defaults.d/90-boot.toml | 0 .../mod.rs | 0 variants/Cargo.lock | 60 ++++++ variants/Cargo.toml | 4 + variants/README.md | 31 ++- variants/aws-k8s-1.29-nvidia/Cargo.toml | 60 ++++++ variants/aws-k8s-1.29/Cargo.toml | 49 +++++ variants/metal-k8s-1.29/Cargo.toml | 52 +++++ variants/vmware-k8s-1.29/Cargo.toml | 57 ++++++ variants/vmware-k8s-1.29/template.ovf | 1 + 118 files changed, 1115 insertions(+), 51 deletions(-) create mode 100644 packages/kubernetes-1.29/Cargo.toml create mode 100644 packages/kubernetes-1.29/clarify.toml create mode 100644 packages/kubernetes-1.29/credential-provider-config-yaml create mode 100644 packages/kubernetes-1.29/dockershim-symlink.conf create mode 100644 packages/kubernetes-1.29/etc-kubernetes-pki-private.mount create mode 100644 packages/kubernetes-1.29/kubelet-bootstrap-kubeconfig create mode 100644 packages/kubernetes-1.29/kubelet-config create mode 100644 packages/kubernetes-1.29/kubelet-env create mode 100644 packages/kubernetes-1.29/kubelet-exec-start-conf create mode 100644 packages/kubernetes-1.29/kubelet-kubeconfig create mode 100644 packages/kubernetes-1.29/kubelet-server-crt create mode 100644 packages/kubernetes-1.29/kubelet-server-key create mode 100644 packages/kubernetes-1.29/kubelet-sysctl.conf create mode 100644 packages/kubernetes-1.29/kubelet.service create mode 100644 packages/kubernetes-1.29/kubernetes-1.29.spec create mode 100644 packages/kubernetes-1.29/kubernetes-ca-crt create mode 100644 packages/kubernetes-1.29/kubernetes-tmpfiles.conf create mode 100644 packages/kubernetes-1.29/logdog.kubelet.conf create mode 100644 packages/kubernetes-1.29/make-kubelet-dirs.conf create mode 100644 packages/kubernetes-1.29/prepare-var-lib-kubelet.service create mode 100644 packages/kubernetes-1.29/prestart-pull-pause-ctr.conf create mode 120000 sources/models/src/aws-k8s-1.28 create mode 120000 sources/models/src/aws-k8s-1.28-nvidia rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/10-defaults.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/15-aws-tuf.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/20-aws-host-containers.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/25-cf-signal.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/26-aws-autoscaling.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/30-metrics.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/31-send-metrics-aws.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/40-aws-creds.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/50-kubernetes-aws.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/51-kubernetes-containerd-nvidia.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/52-kubernetes-services.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/53-containerd-cri-pki.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/54-kubernetes-aws-external-cloud-provider.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/55-kubernetes-aws-credential-provider.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/56-kubernetes-seccomp-default-false.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/60-lockdown-none.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/70-oci-hooks.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/75-oci-defaults-containerd-cri.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/76-oci-defaults-capabilities.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/defaults.d/90-boot.toml (100%) rename sources/models/src/{aws-k8s-1.28-nvidia => aws-k8s-1.29-nvidia}/mod.rs (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/10-defaults.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/15-aws-tuf.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/20-aws-host-containers.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/25-cf-signal.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/26-aws-autoscaling.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/30-metrics.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/31-send-metrics-aws.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/40-aws-creds.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/50-kubernetes-aws.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/51-kubernetes-containerd.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/52-kubernetes-services.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/53-containerd-cri-pki.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/54-kubernetes-aws-external-cloud-provider.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/55-kubernetes-aws-credential-provider.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/56-kubernetes-seccomp-default-false.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/60-lockdown-integrity.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/70-oci-hooks.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/75-oci-defaults-containerd-cri.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/76-oci-defaults-capabilities.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/defaults.d/90-boot.toml (100%) rename sources/models/src/{aws-k8s-1.28 => aws-k8s-1.29}/mod.rs (100%) create mode 120000 sources/models/src/metal-k8s-1.28 rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/10-defaults.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/15-public-tuf.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/20-public-host-containers.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/30-metrics.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/31-send-metrics.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/40-aws-creds.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/50-kubernetes-metal.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/51-kubernetes-containerd.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/52-kubernetes-services.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/53-containerd-cri-pki.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/54-kubernetes-seccomp-default-false.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/60-lockdown-integrity.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/70-public-ntp.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/80-oci-hooks.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/85-oci-defaults-containerd-cri.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/86-oci-defaults-capabilities.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/defaults.d/90-boot.toml (100%) rename sources/models/src/{metal-k8s-1.28 => metal-k8s-1.29}/mod.rs (100%) create mode 120000 sources/models/src/vmware-k8s-1.28 rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/10-defaults.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/15-public-tuf.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/20-public-host-containers.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/30-metrics.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/31-send-metrics.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/40-aws-creds.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/50-kubernetes-vmware.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/51-kubernetes-containerd.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/52-kubernetes-services.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/53-containerd-cri-pki.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/54-kubernetes-seccomp-default-false.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/60-lockdown-integrity.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/70-public-ntp.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/75-oci-defaults-containerd-cri.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/76-oci-defaults-capabilities.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/80-oci-hooks.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/defaults.d/90-boot.toml (100%) rename sources/models/src/{vmware-k8s-1.28 => vmware-k8s-1.29}/mod.rs (100%) create mode 100644 variants/aws-k8s-1.29-nvidia/Cargo.toml create mode 100644 variants/aws-k8s-1.29/Cargo.toml create mode 100644 variants/metal-k8s-1.29/Cargo.toml create mode 100644 variants/vmware-k8s-1.29/Cargo.toml create mode 120000 variants/vmware-k8s-1.29/template.ovf diff --git a/README.md b/README.md index e1be85abc0f..1be645cc62d 100644 --- a/README.md +++ b/README.md @@ -67,12 +67,14 @@ The following variants support EKS, as described above: * `aws-k8s-1.26` * `aws-k8s-1.27` * `aws-k8s-1.28` +* `aws-k8s-1.29` * `aws-k8s-1.23-nvidia` * `aws-k8s-1.24-nvidia` * `aws-k8s-1.25-nvidia` * `aws-k8s-1.26-nvidia` * `aws-k8s-1.27-nvidia` * `aws-k8s-1.28-nvidia` +* `aws-k8s-1.29-nvidia` The following variants support ECS: @@ -88,6 +90,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware: * `vmware-k8s-1.26` * `vmware-k8s-1.27` * `vmware-k8s-1.28` +* `vmware-k8s-1.29` The following variants are designed to be Kubernetes worker nodes on bare metal: @@ -96,6 +99,7 @@ The following variants are designed to be Kubernetes worker nodes on bare metal: * `metal-k8s-1.26` * `metal-k8s-1.27` * `metal-k8s-1.28` +* `metal-k8s-1.29` The following variants are no longer supported: diff --git a/packages/kubernetes-1.29/Cargo.toml b/packages/kubernetes-1.29/Cargo.toml new file mode 100644 index 00000000000..dc96fbe4a77 --- /dev/null +++ b/packages/kubernetes-1.29/Cargo.toml @@ -0,0 +1,32 @@ +[package] +# "." is not allowed in crate names, but we want a friendlier name for the +# directory and spec file, so we override it below. +name = "kubernetes-1_29" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" + +[lib] +path = "../packages.rs" + +[package.metadata.build-package] +package-name = "kubernetes-1.29" + +[[package.metadata.build-package.external-files]] +url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/1/artifacts/kubernetes/v1.29.0/kubernetes-src.tar.gz" +sha512 = "fb94f967683428ca59dd8f203f398b2658ef5b65d517672d16e7f5b4e08662f9ee81065840060301e240f7659ec61543402ad4d0379c5405047c612ede8ad4eb" + +# RPM BuildRequires +[build-dependencies] +glibc = { path = "../glibc" } + +# RPM Requires +[dependencies] +aws-signing-helper = { path = "../aws-signing-helper" } +ecr-credential-provider-1_29 = { path = "../ecr-credential-provider-1.29" } +# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime, +# and are pulled in by `release`. +# conntrack-tools = { path = "../conntrack-tools" } +# containerd = { path = "../containerd" } +# findutils = { path = "../findutils" } diff --git a/packages/kubernetes-1.29/clarify.toml b/packages/kubernetes-1.29/clarify.toml new file mode 100644 index 00000000000..5b6e8b60967 --- /dev/null +++ b/packages/kubernetes-1.29/clarify.toml @@ -0,0 +1,62 @@ +[clarify."github.com/JeffAshton/win_pdh"] +expression = "BSD-3-Clause" +license-files = [ + { path = "LICENSE", hash = 0xb221dcc9 }, +] + +[clarify."github.com/daviddengcn/go-colortext"] +expression = "BSD-3-Clause AND MIT" +license-files = [ + { path = "LICENSE", hash = 0x9769fae1 }, +] + +[clarify."github.com/ghodss/yaml"] +expression = "MIT AND BSD-3-Clause" +license-files = [ + { path = "LICENSE", hash = 0xcdf3ae00 }, +] + +[clarify."github.com/heketi/heketi"] +# kubernetes only uses code that is under LGPLv3+/Apache 2.0, not the code that is GPLv2+/LGPLv3+ +expression = "LGPL-3.0-or-later OR Apache-2.0" +license-files = [ + { path = "LICENSE", hash = 0x3c4b96d1 }, + { path = "LICENSE-APACHE2", hash = 0x438c8616 }, + { path = "COPYING-LGPLV3", hash = 0xf0bccb3a }, +] +skip-files = [ "COPYING-GPLV2" ] + +[clarify."github.com/go-bindata/go-bindata"] +expression = "CC0-1.0" +license-files = [ + { path = "LICENSE", hash = 0x393fafd6 }, +] + +[clarify."github.com/miekg/dns"] +expression = "BSD-3-Clause" +license-files = [ + { path = "COPYRIGHT", hash = 0xe41dd36c }, + { path = "LICENSE", hash = 0xfc8f12ff }, +] + +[clarify."sigs.k8s.io/yaml"] +expression = "MIT AND BSD-3-Clause" +license-files = [ + { path = "LICENSE", hash = 0xcdf3ae00 }, +] + +[clarify."honnef.co/go/tools"] +expression = "MIT AND BSD-3-Clause AND Apache-2.0" +license-files = [ + { path = "LICENSE", hash = 0xad378ed2 }, + { path = "LICENSE-THIRD-PARTY", hash = 0x546425eb }, + { path = "lint/LICENSE", hash = 0xc6b58232 }, + { path = "ssa/LICENSE", hash = 0xe656fb62 }, +] + +[clarify."github.com/storageos/go-api"] +expression = "MIT AND BSD-2-Clause" +license-files = [ + { path = "LICENCE", hash = 0x67a6861e }, +] +skip-files = ["licence.go", "types/licence.go"] diff --git a/packages/kubernetes-1.29/credential-provider-config-yaml b/packages/kubernetes-1.29/credential-provider-config-yaml new file mode 100644 index 00000000000..6c08e3a369a --- /dev/null +++ b/packages/kubernetes-1.29/credential-provider-config-yaml @@ -0,0 +1,38 @@ +[required-extensions] +aws = { version = "v1", optional = true } +kubernetes = "v1" +std = { version = "v1", helpers = ["default"] } ++++ +apiVersion: kubelet.config.k8s.io/v1 +kind: CredentialProviderConfig +providers: +{{#if settings.kubernetes.credential-providers}} +{{#each settings.kubernetes.credential-providers}} +{{#if this.enabled}} + - name: {{@key}} + matchImages: +{{#each this.image-patterns}} + - "{{this}}" +{{/each}} + defaultCacheDuration: "{{default "12h" this.cache-duration}}" + apiVersion: credentialprovider.kubelet.k8s.io/v1 +{{#if (or (eq @key "ecr-credential-provider") this.environment)}} + env: +{{#if this.environment}} +{{#each this.environment}} + - name: {{@key}} + value: '{{this}}' +{{/each}} +{{/if}} +{{#if (eq @key "ecr-credential-provider")}} + - name: HOME + value: '/root' +{{#if @root.settings.aws.profile}} + - name: AWS_PROFILE + value: '{{@root.settings.aws.profile}}' +{{/if}} +{{/if}} +{{/if}} +{{/if}} +{{/each}} +{{/if}} diff --git a/packages/kubernetes-1.29/dockershim-symlink.conf b/packages/kubernetes-1.29/dockershim-symlink.conf new file mode 100644 index 00000000000..d3fcda86914 --- /dev/null +++ b/packages/kubernetes-1.29/dockershim-symlink.conf @@ -0,0 +1,2 @@ +[Service] +ExecStartPre=/bin/ln -sf /run/containerd/containerd.sock /run/dockershim.sock diff --git a/packages/kubernetes-1.29/etc-kubernetes-pki-private.mount b/packages/kubernetes-1.29/etc-kubernetes-pki-private.mount new file mode 100644 index 00000000000..584e61475d1 --- /dev/null +++ b/packages/kubernetes-1.29/etc-kubernetes-pki-private.mount @@ -0,0 +1,16 @@ +[Unit] +Description=Kubernetes PKI private directory (/etc/kubernetes/pki/private) +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target +After=selinux-policy-files.service +Wants=selinux-policy-files.service + +[Mount] +What=tmpfs +Where=/etc/kubernetes/pki/private +Type=tmpfs +Options=nosuid,nodev,noexec,noatime,context=system_u:object_r:secret_t:s0,mode=0700 + +[Install] +WantedBy=preconfigured.target diff --git a/packages/kubernetes-1.29/kubelet-bootstrap-kubeconfig b/packages/kubernetes-1.29/kubelet-bootstrap-kubeconfig new file mode 100644 index 00000000000..52bef7191cc --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-bootstrap-kubeconfig @@ -0,0 +1,25 @@ +[required-extensions] +kubernetes = "v1" ++++ +--- +apiVersion: v1 +kind: Config +clusters: +- cluster: +{{#if settings.kubernetes.api-server}} + certificate-authority: "/etc/kubernetes/pki/ca.crt" + server: "{{settings.kubernetes.api-server}}" +{{/if}} + name: kubernetes +contexts: +- context: + cluster: kubernetes + user: kubelet + name: kubelet +current-context: kubelet +users: +- name: kubelet +{{#if settings.kubernetes.bootstrap-token}} + user: + token: "{{settings.kubernetes.bootstrap-token}}" +{{/if}} diff --git a/packages/kubernetes-1.29/kubelet-config b/packages/kubernetes-1.29/kubelet-config new file mode 100644 index 00000000000..b196ac1d0b1 --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-config @@ -0,0 +1,183 @@ +[required-extensions] +kubernetes = { version = "v1", helpers = ["kube_reserve_cpu", "kube_reserve_memory"] } +std = { version = "v1", helpers = ["any_enabled", "default"] } ++++ +--- +kind: KubeletConfiguration +apiVersion: kubelet.config.k8s.io/v1beta1 +{{#if settings.kubernetes.standalone-mode}} +address: 127.0.0.1 +authentication: + anonymous: + enabled: true + webhook: + enabled: false +authorization: + mode: AlwaysAllow +{{else}} +address: 0.0.0.0 +authentication: + anonymous: + enabled: false + webhook: + cacheTTL: 2m0s + enabled: true + x509: + clientCAFile: "/etc/kubernetes/pki/ca.crt" +authorization: + mode: Webhook + webhook: + cacheAuthorizedTTL: 5m0s + cacheUnauthorizedTTL: 30s +{{/if}} +clusterDomain: {{settings.kubernetes.cluster-domain}} +{{#if settings.kubernetes.cluster-dns-ip}} +clusterDNS: +{{#each settings.kubernetes.cluster-dns-ip}} +- {{this}} +{{else}} +- {{settings.kubernetes.cluster-dns-ip}} +{{/each}} +{{/if}} +{{#if settings.kubernetes.eviction-hard}} +evictionHard: + {{#each settings.kubernetes.eviction-hard}} + {{@key}}: "{{this}}" + {{/each}} +{{/if}} +{{#if settings.kubernetes.eviction-soft}} +evictionSoft: + {{#each settings.kubernetes.eviction-soft}} + {{@key}}: "{{this}}" + {{/each}} +{{/if}} +{{#if settings.kubernetes.eviction-soft-grace-period}} +evictionSoftGracePeriod: + {{#each settings.kubernetes.eviction-soft-grace-period}} + {{@key}}: "{{this}}" + {{/each}} +{{/if}} +{{#if settings.kubernetes.eviction-max-pod-grace-period}} +evictionMaxPodGracePeriod: {{settings.kubernetes.eviction-max-pod-grace-period}} +{{/if}} +{{#if settings.kubernetes.allowed-unsafe-sysctls}} +allowedUnsafeSysctls: {{settings.kubernetes.allowed-unsafe-sysctls}} +{{/if}} +{{#if settings.kubernetes.registry-qps includeZero=true}} +registryPullQPS: {{settings.kubernetes.registry-qps}} +{{/if}} +{{#if settings.kubernetes.registry-burst includeZero=true}} +registryBurst: {{settings.kubernetes.registry-burst}} +{{/if}} +{{#if settings.kubernetes.event-qps includeZero=true}} +eventRecordQPS: {{settings.kubernetes.event-qps}} +{{/if}} +{{#if settings.kubernetes.event-burst includeZero=true}} +eventBurst: {{settings.kubernetes.event-burst}} +{{/if}} +{{#if settings.kubernetes.kube-api-qps includeZero=true}} +kubeAPIQPS: {{settings.kubernetes.kube-api-qps}} +{{/if}} +{{#if settings.kubernetes.kube-api-burst includeZero=true}} +kubeAPIBurst: {{settings.kubernetes.kube-api-burst}} +{{/if}} +kubeReserved: + cpu: "{{kube_reserve_cpu settings.kubernetes.kube-reserved.cpu}}" + {{#if settings.kubernetes.kube-reserved.memory}} + memory: "{{settings.kubernetes.kube-reserved.memory}}" + {{else}} + {{#if settings.kubernetes.max-pods}} + memory: "{{kube_reserve_memory settings.kubernetes.max-pods settings.kubernetes.kube-reserved.memory}}" + {{/if}} + {{/if}} + ephemeral-storage: "{{default "1Gi" settings.kubernetes.kube-reserved.ephemeral-storage}}" +kubeReservedCgroup: "/runtime" +{{#if settings.kubernetes.system-reserved}} +systemReserved: + {{#each settings.kubernetes.system-reserved}} + {{@key}}: "{{this}}" + {{/each}} +systemReservedCgroup: "/system" +{{/if}} +cpuCFSQuota: {{default true settings.kubernetes.cpu-cfs-quota-enforced}} +cpuManagerPolicy: {{default "none" settings.kubernetes.cpu-manager-policy}} +{{#if settings.kubernetes.cpu-manager-reconcile-period}} +cpuManagerReconcilePeriod: {{settings.kubernetes.cpu-manager-reconcile-period}} +{{/if}} +{{#if settings.kubernetes.cpu-manager-policy-options}} +cpuManagerPolicyOptions: +{{#each settings.kubernetes.cpu-manager-policy-options}} + {{this}}: "true" +{{/each}} +{{/if}} +{{#if settings.kubernetes.topology-manager-scope}} +topologyManagerScope: {{settings.kubernetes.topology-manager-scope}} +{{/if}} +{{#if settings.kubernetes.topology-manager-policy}} +topologyManagerPolicy: {{settings.kubernetes.topology-manager-policy}} +{{/if}} +podPidsLimit: {{default 1048576 settings.kubernetes.pod-pids-limit}} +{{#if settings.kubernetes.image-gc-high-threshold-percent includeZero=true}} +imageGCHighThresholdPercent: {{settings.kubernetes.image-gc-high-threshold-percent}} +{{/if}} +{{#if settings.kubernetes.image-gc-low-threshold-percent includeZero=true}} +imageGCLowThresholdPercent: {{settings.kubernetes.image-gc-low-threshold-percent}} +{{/if}} +{{#if settings.kubernetes.provider-id}} +providerID: {{settings.kubernetes.provider-id}} +{{/if}} +resolvConf: "/run/netdog/resolv.conf" +hairpinMode: hairpin-veth +readOnlyPort: 0 +cgroupDriver: systemd +cgroupRoot: "/" +runtimeRequestTimeout: 15m +protectKernelDefaults: true +serializeImagePulls: false +seccompDefault: {{default false settings.kubernetes.seccomp-default}} +{{#if (and (default "" settings.kubernetes.server-certificate) (default "" settings.kubernetes.server-key))}} +tlsCertFile: "/etc/kubernetes/pki/kubelet-server.crt" +tlsPrivateKeyFile: "/etc/kubernetes/pki/private/kubelet-server.key" +{{else}} +serverTLSBootstrap: {{settings.kubernetes.server-tls-bootstrap}} +{{/if}} +tlsCipherSuites: +- TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 +volumePluginDir: "/var/lib/kubelet/plugins/volume/exec" +maxPods: {{default 110 settings.kubernetes.max-pods}} +staticPodPath: "/etc/kubernetes/static-pods/" +{{#if settings.kubernetes.container-log-max-size includeZero=true}} +containerLogMaxSize: {{settings.kubernetes.container-log-max-size}} +{{/if}} +{{#if settings.kubernetes.container-log-max-files includeZero=true}} +containerLogMaxFiles: {{settings.kubernetes.container-log-max-files}} +{{/if}} +{{#if settings.kubernetes.shutdown-grace-period}} +shutdownGracePeriod: {{settings.kubernetes.shutdown-grace-period}} +{{/if}} +{{#if settings.kubernetes.shutdown-grace-period-for-critical-pods}} +shutdownGracePeriodCriticalPods: {{settings.kubernetes.shutdown-grace-period-for-critical-pods}} +{{/if}} +{{#if settings.kubernetes.memory-manager-reserved-memory}} +{{#if (any_enabled settings.kubernetes.memory-manager-reserved-memory)}} +{{#if settings.kubernetes.memory-manager-policy}} +memoryManagerPolicy: {{settings.kubernetes.memory-manager-policy}} +{{/if}} +reservedMemory: +{{#each settings.kubernetes.memory-manager-reserved-memory}} +{{#if this.enabled}} + - numaNode: {{@key}} + limits: +{{#if this.memory}} + memory: {{this.memory}} +{{/if}} +{{#if this.hugepages-1Gi}} + hugepages-1Gi: {{this.hugepages-1Gi}} +{{/if}} +{{#if this.hugepages-2Mi}} + hugepages-2Mi: {{this.hugepages-2Mi}} +{{/if}} +{{/if}} +{{/each}} +{{/if}} +{{/if}} diff --git a/packages/kubernetes-1.29/kubelet-env b/packages/kubernetes-1.29/kubelet-env new file mode 100644 index 00000000000..7a720740552 --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-env @@ -0,0 +1,8 @@ +[required-extensions] +kubernetes = { version = "v1", helpers = ["join_node_taints"] } +std = { version = "v1", helpers = ["join_map"] } ++++ +NODE_IP={{settings.kubernetes.node-ip}} +NODE_LABELS={{join_map "=" "," "no-fail-if-missing" settings.kubernetes.node-labels}} +NODE_TAINTS={{join_node_taints settings.kubernetes.node-taints}} +POD_INFRA_CONTAINER_IMAGE={{settings.kubernetes.pod-infra-container-image}} diff --git a/packages/kubernetes-1.29/kubelet-exec-start-conf b/packages/kubernetes-1.29/kubelet-exec-start-conf new file mode 100644 index 00000000000..3a165be5ae9 --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-exec-start-conf @@ -0,0 +1,37 @@ +[required-extensions] +kubernetes = "v1" +std = { version = "v1", helpers = ["any_enabled", "default"] } ++++ +[Service] +ExecStart= +ExecStart=/usr/bin/kubelet \ +{{#unless settings.kubernetes.standalone-mode}} + --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 \ +{{/if}} +{{else}} + --cloud-provider "" \ +{{/unless}} + --config /etc/kubernetes/kubelet/config \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ + --containerd=/run/containerd/containerd.sock \ + --root-dir /var/lib/kubelet \ + --cert-dir /var/lib/kubelet/pki \ +{{#if settings.kubernetes.credential-providers}} +{{#if (any_enabled settings.kubernetes.credential-providers)}} + --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}" \ + --register-with-taints "${NODE_TAINTS}" \ +{{#if settings.kubernetes.log-level includeZero=true}} + -v {{settings.kubernetes.log-level}} \ +{{/if}} + --pod-infra-container-image ${POD_INFRA_CONTAINER_IMAGE} diff --git a/packages/kubernetes-1.29/kubelet-kubeconfig b/packages/kubernetes-1.29/kubelet-kubeconfig new file mode 100644 index 00000000000..0dfdcd275fe --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-kubeconfig @@ -0,0 +1,43 @@ +[required-extensions] +aws = { version = "v1", optional = true } +kubernetes = "v1" ++++ +--- +apiVersion: v1 +kind: Config +clusters: +- cluster: +{{#if settings.kubernetes.api-server}} + certificate-authority: "/etc/kubernetes/pki/ca.crt" + server: "{{settings.kubernetes.api-server}}" +{{/if}} + name: kubernetes +contexts: +- context: + cluster: kubernetes + user: kubelet + name: kubelet +current-context: kubelet +users: +- name: kubelet +{{#if (eq settings.kubernetes.authentication-mode "aws")}} +{{#if settings.kubernetes.cluster-name}} + user: + exec: + apiVersion: client.authentication.k8s.io/v1beta1 + command: "/usr/bin/aws-iam-authenticator" + args: + - token + - "-i" + - "{{settings.kubernetes.cluster-name}}" + {{#if settings.aws.region}} + - "--region" + - "{{settings.aws.region}}" + {{/if}} +{{/if}} +{{/if}} +{{#if (eq settings.kubernetes.authentication-mode "tls")}} + user: + client-certificate: "/var/lib/kubelet/pki/kubelet-client-current.pem" + client-key: "/var/lib/kubelet/pki/kubelet-client-current.pem" +{{/if}} diff --git a/packages/kubernetes-1.29/kubelet-server-crt b/packages/kubernetes-1.29/kubelet-server-crt new file mode 100644 index 00000000000..92003ad427e --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-server-crt @@ -0,0 +1,7 @@ +[required-extensions] +kubernetes = "v1" +std = { version = "v1", helpers = ["base64_decode"] } ++++ +{{~#if settings.kubernetes.server-certificate~}} +{{base64_decode settings.kubernetes.server-certificate}} +{{~/if~}} diff --git a/packages/kubernetes-1.29/kubelet-server-key b/packages/kubernetes-1.29/kubelet-server-key new file mode 100644 index 00000000000..b6c74aacc56 --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-server-key @@ -0,0 +1,7 @@ +[required-extensions] +kubernetes = "v1" +std = { version = "v1", helpers = ["base64_decode"] } ++++ +{{~#if settings.kubernetes.server-key~}} +{{base64_decode settings.kubernetes.server-key}} +{{~/if~}} diff --git a/packages/kubernetes-1.29/kubelet-sysctl.conf b/packages/kubernetes-1.29/kubelet-sysctl.conf new file mode 100644 index 00000000000..ed68c7e197f --- /dev/null +++ b/packages/kubernetes-1.29/kubelet-sysctl.conf @@ -0,0 +1,2 @@ +# Overcommit handling mode - 1: Always overcommit +vm.overcommit_memory = 1 diff --git a/packages/kubernetes-1.29/kubelet.service b/packages/kubernetes-1.29/kubelet.service new file mode 100644 index 00000000000..1285853f2d1 --- /dev/null +++ b/packages/kubernetes-1.29/kubelet.service @@ -0,0 +1,26 @@ +[Unit] +Description=Kubelet +Documentation=https://github.com/kubernetes/kubernetes +After=containerd.service configured.target +Wants=configured.target +BindsTo=containerd.service + +[Service] +Slice=runtime.slice +Type=notify +EnvironmentFile=/etc/network/proxy.env +EnvironmentFile=/etc/kubernetes/kubelet/env +ExecStartPre=/sbin/iptables -P FORWARD ACCEPT +# Must be overridden by a drop-in file or `kubelet` won't start +ExecStart=/usr/bin/false + +Restart=always +RestartForceExitStatus=SIGPIPE +RestartSec=5 +Delegate=yes +KillMode=process +CPUAccounting=true +MemoryAccounting=true + +[Install] +WantedBy=multi-user.target diff --git a/packages/kubernetes-1.29/kubernetes-1.29.spec b/packages/kubernetes-1.29/kubernetes-1.29.spec new file mode 100644 index 00000000000..d8a139a6eb6 --- /dev/null +++ b/packages/kubernetes-1.29/kubernetes-1.29.spec @@ -0,0 +1,164 @@ +# After this upstream change, the linker flags `-s -w` are always added unless +# DBG=1 is set in the environment, which would set compiler flags to disable +# optimizations and inlining: +# https://github.com/kubernetes/kubernetes/pull/108371 +# +# For now, work around this by indicating that no debug package is expected. +%global debug_package %{nil} + +%global goproject github.com/kubernetes +%global gorepo kubernetes +%global goimport %{goproject}/%{gorepo} + +%global gover 1.29.0 +%global rpmver %{gover} + +%global _dwz_low_mem_die_limit 0 + +# The kubernetes build process expects the cross-compiler to be specified via `KUBE_*_CC` +# Here we generate that variable to use bottlerocket-specific compile aliases +# Examples of the generated variable: +# KUBE_LINUX_AMD64_CC=x86_64-bottlerocket-linux-gnu-gcc +# KUBE_LINUX_ARM64_CC=aarch64-bottlerocket-linux-gnu-gcc +%global kube_cc %{shrink: \ + %{lua: print(string.upper( \ + rpm.expand("KUBE_%{_cross_go_os}_%{_cross_go_arch}_CC=")) .. \ + rpm.expand("%{_cross_target}-gcc")) }} + +Name: %{_cross_os}%{gorepo} +Version: %{rpmver} +Release: 1%{?dist} +Summary: Container cluster management +# base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause +License: Apache-2.0 AND BSD-3-Clause +URL: https://%{goimport} +Source0: https://distro.eks.amazonaws.com/kubernetes-1-29/releases/1/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz +Source1: kubelet.service +Source2: kubelet-env +Source3: kubelet-config +Source4: kubelet-kubeconfig +Source5: kubernetes-ca-crt +Source6: kubelet-exec-start-conf +Source7: kubelet-bootstrap-kubeconfig +Source8: kubernetes-tmpfiles.conf +Source9: kubelet-sysctl.conf +Source10: prepare-var-lib-kubelet.service +Source11: kubelet-server-crt +Source12: kubelet-server-key +Source13: etc-kubernetes-pki-private.mount +Source14: credential-provider-config-yaml +Source15: logdog.kubelet.conf + +# ExecStartPre drop-ins +Source20: prestart-pull-pause-ctr.conf +Source21: dockershim-symlink.conf +Source22: make-kubelet-dirs.conf + +Source1000: clarify.toml + +BuildRequires: git +BuildRequires: rsync +BuildRequires: %{_cross_os}glibc-devel + +%description +%{summary}. + +%package -n %{_cross_os}kubelet-1.29 +Summary: Container cluster node agent +Requires: %{_cross_os}conntrack-tools +Requires: %{_cross_os}containerd +Requires: %{_cross_os}findutils +Requires: %{_cross_os}ecr-credential-provider-1.27 +Requires: %{_cross_os}aws-signing-helper + +%description -n %{_cross_os}kubelet-1.29 +%{summary}. + +%prep +%autosetup -Sgit -c -n %{gorepo}-%{gover} -p1 + +# third_party licenses +# multiarch/qemu-user-static ignored, we're not using it +cp third_party/forked/gonum/graph/LICENSE LICENSE.gonum.graph +cp third_party/forked/shell2junit/LICENSE LICENSE.shell2junit +cp third_party/forked/golang/LICENSE LICENSE.golang +cp third_party/forked/golang/PATENTS PATENTS.golang + +%build +# Build codegen programs with the host toolchain. +make hack/update-codegen.sh + +# Build kubelet with the target toolchain. +export KUBE_BUILD_PLATFORMS="linux/%{_cross_go_arch}" +export %{kube_cc} +export GOFLAGS='-tags=dockerless' +export GOLDFLAGS="-buildmode=pie -linkmode=external -compressdwarf=false" +make WHAT="cmd/kubelet" + +%install +output="./_output/local/bin/linux/%{_cross_go_arch}" +install -d %{buildroot}%{_cross_bindir} +install -p -m 0755 ${output}/kubelet %{buildroot}%{_cross_bindir} + +install -d %{buildroot}%{_cross_unitdir} +install -p -m 0644 %{S:1} %{S:10} %{S:13} %{buildroot}%{_cross_unitdir} + +install -d %{buildroot}%{_cross_unitdir}/kubelet.service.d +install -p -m 0644 %{S:20} %{S:21} %{S:22} %{buildroot}%{_cross_unitdir}/kubelet.service.d + +mkdir -p %{buildroot}%{_cross_templatedir} +install -m 0644 %{S:2} %{buildroot}%{_cross_templatedir}/kubelet-env +install -m 0644 %{S:3} %{buildroot}%{_cross_templatedir}/kubelet-config +install -m 0644 %{S:4} %{buildroot}%{_cross_templatedir}/kubelet-kubeconfig +install -m 0644 %{S:5} %{buildroot}%{_cross_templatedir}/kubernetes-ca-crt +install -m 0644 %{S:6} %{buildroot}%{_cross_templatedir}/kubelet-exec-start-conf +install -m 0644 %{S:7} %{buildroot}%{_cross_templatedir}/kubelet-bootstrap-kubeconfig +install -m 0644 %{S:11} %{buildroot}%{_cross_templatedir}/kubelet-server-crt +install -m 0644 %{S:12} %{buildroot}%{_cross_templatedir}/kubelet-server-key +install -m 0644 %{S:14} %{buildroot}%{_cross_templatedir}/credential-provider-config-yaml + +install -d %{buildroot}%{_cross_tmpfilesdir} +install -p -m 0644 %{S:8} %{buildroot}%{_cross_tmpfilesdir}/kubernetes.conf + +install -d %{buildroot}%{_cross_sysctldir} +install -p -m 0644 %{S:9} %{buildroot}%{_cross_sysctldir}/90-kubelet.conf + +install -d %{buildroot}%{_cross_libexecdir}/kubernetes +ln -rs \ + %{buildroot}%{_sharedstatedir}/kubelet/plugins \ + %{buildroot}%{_cross_libexecdir}/kubernetes/kubelet-plugins + +%cross_scan_attribution --clarify %{S:1000} go-vendor vendor + +install -d %{buildroot}%{_cross_datadir}/logdog.d +install -p -m 0644 %{S:15} %{buildroot}%{_cross_datadir}/logdog.d + +%files -n %{_cross_os}kubelet-1.29 +%license LICENSE LICENSE.gonum.graph LICENSE.shell2junit LICENSE.golang PATENTS.golang +%{_cross_attribution_file} +%{_cross_attribution_vendor_dir} +%{_cross_bindir}/kubelet +%{_cross_unitdir}/kubelet.service +%{_cross_unitdir}/prepare-var-lib-kubelet.service +%{_cross_unitdir}/etc-kubernetes-pki-private.mount +%dir %{_cross_unitdir}/kubelet.service.d +%{_cross_unitdir}/kubelet.service.d/prestart-pull-pause-ctr.conf +%{_cross_unitdir}/kubelet.service.d/make-kubelet-dirs.conf +%{_cross_unitdir}/kubelet.service.d/dockershim-symlink.conf +%dir %{_cross_templatedir} +%{_cross_templatedir}/kubelet-env +%{_cross_templatedir}/kubelet-config +%{_cross_templatedir}/kubelet-kubeconfig +%{_cross_templatedir}/kubelet-bootstrap-kubeconfig +%{_cross_templatedir}/kubelet-exec-start-conf +%{_cross_templatedir}/kubernetes-ca-crt +%{_cross_templatedir}/kubelet-server-crt +%{_cross_templatedir}/kubelet-server-key +%{_cross_templatedir}/credential-provider-config-yaml +%{_cross_tmpfilesdir}/kubernetes.conf +%{_cross_sysctldir}/90-kubelet.conf +%dir %{_cross_libexecdir}/kubernetes +%{_cross_libexecdir}/kubernetes/kubelet-plugins +%{_cross_datadir}/logdog.d/logdog.kubelet.conf + +%changelog diff --git a/packages/kubernetes-1.29/kubernetes-ca-crt b/packages/kubernetes-1.29/kubernetes-ca-crt new file mode 100644 index 00000000000..93fd4e253ec --- /dev/null +++ b/packages/kubernetes-1.29/kubernetes-ca-crt @@ -0,0 +1,7 @@ +[required-extensions] +kubernetes = "v1" +std = { version = "v1", helpers = ["base64_decode"] } ++++ +{{~#if settings.kubernetes.cluster-certificate~}} +{{base64_decode settings.kubernetes.cluster-certificate}} +{{~/if~}} diff --git a/packages/kubernetes-1.29/kubernetes-tmpfiles.conf b/packages/kubernetes-1.29/kubernetes-tmpfiles.conf new file mode 100644 index 00000000000..15c1deec646 --- /dev/null +++ b/packages/kubernetes-1.29/kubernetes-tmpfiles.conf @@ -0,0 +1,5 @@ +d /etc/kubernetes/static-pods - - - - +L /etc/kubernetes/manifests - - - - static-pods +L /etc/kubernetes/secrets-store-csi-providers - - - - /var/lib/kubelet/providers/secrets-store +r! /var/lib/kubelet/cpu_manager_state +L /etc/kubernetes/node-feature-discovery/features.d - - - - /var/lib/kubelet/node-feature-discovery/features.d diff --git a/packages/kubernetes-1.29/logdog.kubelet.conf b/packages/kubernetes-1.29/logdog.kubelet.conf new file mode 100644 index 00000000000..850a0b4c1ba --- /dev/null +++ b/packages/kubernetes-1.29/logdog.kubelet.conf @@ -0,0 +1,3 @@ +exec kube-status systemctl status kube* -l --no-pager +file ipamd.log /var/log/aws-routed-eni/ipamd.log +file plugin.log /var/log/aws-routed-eni/plugin.log diff --git a/packages/kubernetes-1.29/make-kubelet-dirs.conf b/packages/kubernetes-1.29/make-kubelet-dirs.conf new file mode 100644 index 00000000000..a7249c9ac3f --- /dev/null +++ b/packages/kubernetes-1.29/make-kubelet-dirs.conf @@ -0,0 +1,5 @@ +[Service] +# Create the backing directories for symlinks in /etc +ExecStartPre=/usr/bin/mkdir -p \ + /var/lib/kubelet/providers/secrets-store \ + /var/lib/kubelet/node-feature-discovery/features.d diff --git a/packages/kubernetes-1.29/prepare-var-lib-kubelet.service b/packages/kubernetes-1.29/prepare-var-lib-kubelet.service new file mode 100644 index 00000000000..1b8c6207aa4 --- /dev/null +++ b/packages/kubernetes-1.29/prepare-var-lib-kubelet.service @@ -0,0 +1,23 @@ +[Unit] +Description=Prepare Kubelet Directory (/var/lib/kubelet) +DefaultDependencies=no +RequiresMountsFor=/var +RefuseManualStart=true +RefuseManualStop=true + +[Service] +Type=oneshot + +# Remove an existing symlink, if present. Intentionally not recursive! +ExecStartPre=-/usr/bin/rm -f /var/lib/kubelet + +# Create /var/lib/kubelet so it is available for bind mounts. +ExecStart=/usr/bin/mkdir -p /var/lib/kubelet + +# Suppress warning if directory exists. +StandardError=null + +RemainAfterExit=true + +[Install] +WantedBy=local-fs.target diff --git a/packages/kubernetes-1.29/prestart-pull-pause-ctr.conf b/packages/kubernetes-1.29/prestart-pull-pause-ctr.conf new file mode 100644 index 00000000000..5f6d04cb28e --- /dev/null +++ b/packages/kubernetes-1.29/prestart-pull-pause-ctr.conf @@ -0,0 +1,9 @@ +[Service] +# Pull the pause container image before starting `kubelet` so `containerd/cri` wouldn't have to +ExecStartPre=/usr/bin/host-ctr \ + --containerd-socket=/run/containerd/containerd.sock \ + --namespace=k8s.io \ + pull-image \ + --source=${POD_INFRA_CONTAINER_IMAGE} \ + --registry-config=/etc/host-containers/host-ctr.toml \ + --skip-if-image-exists=true diff --git a/sources/models/README.md b/sources/models/README.md index 00f477a04b9..5dbaadda55b 100644 --- a/sources/models/README.md +++ b/sources/models/README.md @@ -74,13 +74,23 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and ### aws-k8s-1.28: Kubernetes 1.28 -* [Model](src/aws-k8s-1.28/mod.rs) -* [Default settings](src/aws-k8s-1.28/defaults.d/) +* [Model](src/aws-k8s-1.29/mod.rs) +* [Default settings](src/aws-k8s-1.29/defaults.d/) ### aws-k8s-1.28-nvidia: Kubernetes 1.28 NVIDIA -* [Model](src/aws-k8s-1.28-nvidia/mod.rs) -* [Default settings](src/aws-k8s-1.28-nvidia/defaults.d/) +* [Model](src/aws-k8s-1.29-nvidia/mod.rs) +* [Default settings](src/aws-k8s-1.29-nvidia/defaults.d/) + +### aws-k8s-1.29: Kubernetes 1.29 + +* [Model](src/aws-k8s-1.29/mod.rs) +* [Default settings](src/aws-k8s-1.29/defaults.d/) + +### aws-k8s-1.29-nvidia: Kubernetes 1.29 NVIDIA + +* [Model](src/aws-k8s-1.29-nvidia/mod.rs) +* [Default settings](src/aws-k8s-1.29-nvidia/defaults.d/) ### aws-ecs-1: Amazon ECS @@ -114,28 +124,33 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and ### vmware-k8s-1.24: VMware Kubernetes 1.24 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ### vmware-k8s-1.25: VMware Kubernetes 1.25 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ### vmware-k8s-1.26: VMware Kubernetes 1.26 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ### vmware-k8s-1.27: VMware Kubernetes 1.27 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) -### vmware-k8s-1.27: VMware Kubernetes 1.27 +### vmware-k8s-1.28: VMware Kubernetes 1.28 + +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +### vmware-k8s-1.29: VMware Kubernetes 1.29 + +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ### metal-dev: Metal development build @@ -144,28 +159,33 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and ### metal-k8s-1.24: Metal Kubernetes 1.24 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ### metal-k8s-1.25: Metal Kubernetes 1.25 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ### metal-k8s-1.26: Metal Kubernetes 1.26 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ### metal-k8s-1.27: Metal Kubernetes 1.27 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ### metal-k8s-1.28: Metal Kubernetes 1.28 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) + +### metal-k8s-1.29: Metal Kubernetes 1.29 + +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ## This directory diff --git a/sources/models/src/aws-k8s-1.28 b/sources/models/src/aws-k8s-1.28 new file mode 120000 index 00000000000..811eaea1370 --- /dev/null +++ b/sources/models/src/aws-k8s-1.28 @@ -0,0 +1 @@ +aws-k8s-1.29 \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.28-nvidia b/sources/models/src/aws-k8s-1.28-nvidia new file mode 120000 index 00000000000..d13432d244f --- /dev/null +++ b/sources/models/src/aws-k8s-1.28-nvidia @@ -0,0 +1 @@ +aws-k8s-1.29-nvidia \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/10-defaults.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/10-defaults.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/10-defaults.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/10-defaults.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/15-aws-tuf.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/15-aws-tuf.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/15-aws-tuf.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/15-aws-tuf.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/20-aws-host-containers.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/20-aws-host-containers.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/20-aws-host-containers.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/20-aws-host-containers.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/25-cf-signal.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/25-cf-signal.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/25-cf-signal.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/25-cf-signal.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/26-aws-autoscaling.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/26-aws-autoscaling.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/26-aws-autoscaling.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/26-aws-autoscaling.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/30-metrics.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/30-metrics.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/30-metrics.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/30-metrics.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/31-send-metrics-aws.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/31-send-metrics-aws.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/31-send-metrics-aws.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/31-send-metrics-aws.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/40-aws-creds.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/40-aws-creds.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/40-aws-creds.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/40-aws-creds.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/50-kubernetes-aws.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/50-kubernetes-aws.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/50-kubernetes-aws.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/50-kubernetes-aws.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/52-kubernetes-services.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/52-kubernetes-services.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/52-kubernetes-services.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/52-kubernetes-services.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/53-containerd-cri-pki.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/53-containerd-cri-pki.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/53-containerd-cri-pki.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/60-lockdown-none.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/60-lockdown-none.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/60-lockdown-none.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/60-lockdown-none.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/70-oci-hooks.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/70-oci-hooks.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/70-oci-hooks.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/70-oci-hooks.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/76-oci-defaults-capabilities.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/76-oci-defaults-capabilities.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/76-oci-defaults-capabilities.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/76-oci-defaults-capabilities.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/defaults.d/90-boot.toml b/sources/models/src/aws-k8s-1.29-nvidia/defaults.d/90-boot.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/defaults.d/90-boot.toml rename to sources/models/src/aws-k8s-1.29-nvidia/defaults.d/90-boot.toml diff --git a/sources/models/src/aws-k8s-1.28-nvidia/mod.rs b/sources/models/src/aws-k8s-1.29-nvidia/mod.rs similarity index 100% rename from sources/models/src/aws-k8s-1.28-nvidia/mod.rs rename to sources/models/src/aws-k8s-1.29-nvidia/mod.rs diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/10-defaults.toml b/sources/models/src/aws-k8s-1.29/defaults.d/10-defaults.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/10-defaults.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/10-defaults.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/15-aws-tuf.toml b/sources/models/src/aws-k8s-1.29/defaults.d/15-aws-tuf.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/15-aws-tuf.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/15-aws-tuf.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/20-aws-host-containers.toml b/sources/models/src/aws-k8s-1.29/defaults.d/20-aws-host-containers.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/20-aws-host-containers.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/20-aws-host-containers.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/25-cf-signal.toml b/sources/models/src/aws-k8s-1.29/defaults.d/25-cf-signal.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/25-cf-signal.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/25-cf-signal.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/26-aws-autoscaling.toml b/sources/models/src/aws-k8s-1.29/defaults.d/26-aws-autoscaling.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/26-aws-autoscaling.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/26-aws-autoscaling.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/30-metrics.toml b/sources/models/src/aws-k8s-1.29/defaults.d/30-metrics.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/30-metrics.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/30-metrics.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/31-send-metrics-aws.toml b/sources/models/src/aws-k8s-1.29/defaults.d/31-send-metrics-aws.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/31-send-metrics-aws.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/31-send-metrics-aws.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/40-aws-creds.toml b/sources/models/src/aws-k8s-1.29/defaults.d/40-aws-creds.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/40-aws-creds.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/40-aws-creds.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/50-kubernetes-aws.toml b/sources/models/src/aws-k8s-1.29/defaults.d/50-kubernetes-aws.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/50-kubernetes-aws.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/50-kubernetes-aws.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/51-kubernetes-containerd.toml b/sources/models/src/aws-k8s-1.29/defaults.d/51-kubernetes-containerd.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/51-kubernetes-containerd.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/51-kubernetes-containerd.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/52-kubernetes-services.toml b/sources/models/src/aws-k8s-1.29/defaults.d/52-kubernetes-services.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/52-kubernetes-services.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/52-kubernetes-services.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/aws-k8s-1.29/defaults.d/53-containerd-cri-pki.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/53-containerd-cri-pki.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/53-containerd-cri-pki.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/54-kubernetes-aws-external-cloud-provider.toml b/sources/models/src/aws-k8s-1.29/defaults.d/54-kubernetes-aws-external-cloud-provider.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/54-kubernetes-aws-external-cloud-provider.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/54-kubernetes-aws-external-cloud-provider.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/55-kubernetes-aws-credential-provider.toml b/sources/models/src/aws-k8s-1.29/defaults.d/55-kubernetes-aws-credential-provider.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/55-kubernetes-aws-credential-provider.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/55-kubernetes-aws-credential-provider.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/56-kubernetes-seccomp-default-false.toml b/sources/models/src/aws-k8s-1.29/defaults.d/56-kubernetes-seccomp-default-false.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/56-kubernetes-seccomp-default-false.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/56-kubernetes-seccomp-default-false.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/60-lockdown-integrity.toml b/sources/models/src/aws-k8s-1.29/defaults.d/60-lockdown-integrity.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/60-lockdown-integrity.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/60-lockdown-integrity.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/70-oci-hooks.toml b/sources/models/src/aws-k8s-1.29/defaults.d/70-oci-hooks.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/70-oci-hooks.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/70-oci-hooks.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/models/src/aws-k8s-1.29/defaults.d/75-oci-defaults-containerd-cri.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/75-oci-defaults-containerd-cri.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/75-oci-defaults-containerd-cri.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/76-oci-defaults-capabilities.toml b/sources/models/src/aws-k8s-1.29/defaults.d/76-oci-defaults-capabilities.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/76-oci-defaults-capabilities.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/76-oci-defaults-capabilities.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/aws-k8s-1.29/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml diff --git a/sources/models/src/aws-k8s-1.28/defaults.d/90-boot.toml b/sources/models/src/aws-k8s-1.29/defaults.d/90-boot.toml similarity index 100% rename from sources/models/src/aws-k8s-1.28/defaults.d/90-boot.toml rename to sources/models/src/aws-k8s-1.29/defaults.d/90-boot.toml diff --git a/sources/models/src/aws-k8s-1.28/mod.rs b/sources/models/src/aws-k8s-1.29/mod.rs similarity index 100% rename from sources/models/src/aws-k8s-1.28/mod.rs rename to sources/models/src/aws-k8s-1.29/mod.rs diff --git a/sources/models/src/lib.rs b/sources/models/src/lib.rs index 1a6ee2c9d5b..7f44cb81f45 100644 --- a/sources/models/src/lib.rs +++ b/sources/models/src/lib.rs @@ -71,13 +71,23 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and ## aws-k8s-1.28: Kubernetes 1.28 -* [Model](src/aws-k8s-1.28/mod.rs) -* [Default settings](src/aws-k8s-1.28/defaults.d/) +* [Model](src/aws-k8s-1.29/mod.rs) +* [Default settings](src/aws-k8s-1.29/defaults.d/) ## aws-k8s-1.28-nvidia: Kubernetes 1.28 NVIDIA -* [Model](src/aws-k8s-1.28-nvidia/mod.rs) -* [Default settings](src/aws-k8s-1.28-nvidia/defaults.d/) +* [Model](src/aws-k8s-1.29-nvidia/mod.rs) +* [Default settings](src/aws-k8s-1.29-nvidia/defaults.d/) + +## aws-k8s-1.29: Kubernetes 1.29 + +* [Model](src/aws-k8s-1.29/mod.rs) +* [Default settings](src/aws-k8s-1.29/defaults.d/) + +## aws-k8s-1.29-nvidia: Kubernetes 1.29 NVIDIA + +* [Model](src/aws-k8s-1.29-nvidia/mod.rs) +* [Default settings](src/aws-k8s-1.29-nvidia/defaults.d/) ## aws-ecs-1: Amazon ECS @@ -111,28 +121,33 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and ## vmware-k8s-1.24: VMware Kubernetes 1.24 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ## vmware-k8s-1.25: VMware Kubernetes 1.25 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ## vmware-k8s-1.26: VMware Kubernetes 1.26 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ## vmware-k8s-1.27: VMware Kubernetes 1.27 -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) -## vmware-k8s-1.27: VMware Kubernetes 1.27 +## vmware-k8s-1.28: VMware Kubernetes 1.28 + +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) -* [Model](src/vmware-k8s-1.28/mod.rs) -* [Default settings](src/vmware-k8s-1.28/defaults.d/) +## vmware-k8s-1.29: VMware Kubernetes 1.29 + +* [Model](src/vmware-k8s-1.29/mod.rs) +* [Default settings](src/vmware-k8s-1.29/defaults.d/) ## metal-dev: Metal development build @@ -141,28 +156,33 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and ## metal-k8s-1.24: Metal Kubernetes 1.24 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ## metal-k8s-1.25: Metal Kubernetes 1.25 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ## metal-k8s-1.26: Metal Kubernetes 1.26 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ## metal-k8s-1.27: Metal Kubernetes 1.27 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) ## metal-k8s-1.28: Metal Kubernetes 1.28 -* [Model](src/metal-k8s-1.28/mod.rs) -* [Default settings](src/metal-k8s-1.28/defaults.d/) +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) + +## metal-k8s-1.29: Metal Kubernetes 1.29 + +* [Model](src/metal-k8s-1.29/mod.rs) +* [Default settings](src/metal-k8s-1.29/defaults.d/) # This directory diff --git a/sources/models/src/metal-k8s-1.28 b/sources/models/src/metal-k8s-1.28 new file mode 120000 index 00000000000..4b52aa5a9f7 --- /dev/null +++ b/sources/models/src/metal-k8s-1.28 @@ -0,0 +1 @@ +metal-k8s-1.29 \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/10-defaults.toml b/sources/models/src/metal-k8s-1.29/defaults.d/10-defaults.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/10-defaults.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/10-defaults.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/15-public-tuf.toml b/sources/models/src/metal-k8s-1.29/defaults.d/15-public-tuf.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/15-public-tuf.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/15-public-tuf.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/20-public-host-containers.toml b/sources/models/src/metal-k8s-1.29/defaults.d/20-public-host-containers.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/20-public-host-containers.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/20-public-host-containers.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/30-metrics.toml b/sources/models/src/metal-k8s-1.29/defaults.d/30-metrics.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/30-metrics.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/30-metrics.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/31-send-metrics.toml b/sources/models/src/metal-k8s-1.29/defaults.d/31-send-metrics.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/31-send-metrics.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/31-send-metrics.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/40-aws-creds.toml b/sources/models/src/metal-k8s-1.29/defaults.d/40-aws-creds.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/40-aws-creds.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/40-aws-creds.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/50-kubernetes-metal.toml b/sources/models/src/metal-k8s-1.29/defaults.d/50-kubernetes-metal.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/50-kubernetes-metal.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/50-kubernetes-metal.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/51-kubernetes-containerd.toml b/sources/models/src/metal-k8s-1.29/defaults.d/51-kubernetes-containerd.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/51-kubernetes-containerd.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/51-kubernetes-containerd.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/52-kubernetes-services.toml b/sources/models/src/metal-k8s-1.29/defaults.d/52-kubernetes-services.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/52-kubernetes-services.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/52-kubernetes-services.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/metal-k8s-1.29/defaults.d/53-containerd-cri-pki.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/53-containerd-cri-pki.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/53-containerd-cri-pki.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/54-kubernetes-seccomp-default-false.toml b/sources/models/src/metal-k8s-1.29/defaults.d/54-kubernetes-seccomp-default-false.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/54-kubernetes-seccomp-default-false.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/54-kubernetes-seccomp-default-false.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/60-lockdown-integrity.toml b/sources/models/src/metal-k8s-1.29/defaults.d/60-lockdown-integrity.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/60-lockdown-integrity.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/60-lockdown-integrity.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/70-public-ntp.toml b/sources/models/src/metal-k8s-1.29/defaults.d/70-public-ntp.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/70-public-ntp.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/70-public-ntp.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/80-oci-hooks.toml b/sources/models/src/metal-k8s-1.29/defaults.d/80-oci-hooks.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/80-oci-hooks.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/80-oci-hooks.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/85-oci-defaults-containerd-cri.toml b/sources/models/src/metal-k8s-1.29/defaults.d/85-oci-defaults-containerd-cri.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/85-oci-defaults-containerd-cri.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/85-oci-defaults-containerd-cri.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/86-oci-defaults-capabilities.toml b/sources/models/src/metal-k8s-1.29/defaults.d/86-oci-defaults-capabilities.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/86-oci-defaults-capabilities.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/86-oci-defaults-capabilities.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/metal-k8s-1.29/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml diff --git a/sources/models/src/metal-k8s-1.28/defaults.d/90-boot.toml b/sources/models/src/metal-k8s-1.29/defaults.d/90-boot.toml similarity index 100% rename from sources/models/src/metal-k8s-1.28/defaults.d/90-boot.toml rename to sources/models/src/metal-k8s-1.29/defaults.d/90-boot.toml diff --git a/sources/models/src/metal-k8s-1.28/mod.rs b/sources/models/src/metal-k8s-1.29/mod.rs similarity index 100% rename from sources/models/src/metal-k8s-1.28/mod.rs rename to sources/models/src/metal-k8s-1.29/mod.rs diff --git a/sources/models/src/vmware-k8s-1.28 b/sources/models/src/vmware-k8s-1.28 new file mode 120000 index 00000000000..76e641c1ddc --- /dev/null +++ b/sources/models/src/vmware-k8s-1.28 @@ -0,0 +1 @@ +vmware-k8s-1.29 \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/10-defaults.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/10-defaults.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/10-defaults.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/10-defaults.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/15-public-tuf.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/15-public-tuf.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/15-public-tuf.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/15-public-tuf.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/20-public-host-containers.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/20-public-host-containers.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/20-public-host-containers.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/20-public-host-containers.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/30-metrics.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/30-metrics.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/30-metrics.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/30-metrics.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/31-send-metrics.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/31-send-metrics.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/31-send-metrics.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/31-send-metrics.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/40-aws-creds.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/40-aws-creds.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/40-aws-creds.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/40-aws-creds.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/50-kubernetes-vmware.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/50-kubernetes-vmware.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/50-kubernetes-vmware.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/50-kubernetes-vmware.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/51-kubernetes-containerd.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/51-kubernetes-containerd.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/51-kubernetes-containerd.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/51-kubernetes-containerd.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/52-kubernetes-services.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/52-kubernetes-services.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/52-kubernetes-services.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/52-kubernetes-services.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/53-containerd-cri-pki.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/53-containerd-cri-pki.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/53-containerd-cri-pki.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/54-kubernetes-seccomp-default-false.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/54-kubernetes-seccomp-default-false.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/54-kubernetes-seccomp-default-false.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/54-kubernetes-seccomp-default-false.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/60-lockdown-integrity.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/60-lockdown-integrity.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/60-lockdown-integrity.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/60-lockdown-integrity.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/70-public-ntp.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/70-public-ntp.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/70-public-ntp.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/70-public-ntp.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/75-oci-defaults-containerd-cri.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/75-oci-defaults-containerd-cri.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/75-oci-defaults-containerd-cri.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/76-oci-defaults-capabilities.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/76-oci-defaults-capabilities.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/76-oci-defaults-capabilities.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/76-oci-defaults-capabilities.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/80-oci-hooks.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/80-oci-hooks.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/80-oci-hooks.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/80-oci-hooks.toml diff --git a/sources/models/src/vmware-k8s-1.28/defaults.d/90-boot.toml b/sources/models/src/vmware-k8s-1.29/defaults.d/90-boot.toml similarity index 100% rename from sources/models/src/vmware-k8s-1.28/defaults.d/90-boot.toml rename to sources/models/src/vmware-k8s-1.29/defaults.d/90-boot.toml diff --git a/sources/models/src/vmware-k8s-1.28/mod.rs b/sources/models/src/vmware-k8s-1.29/mod.rs similarity index 100% rename from sources/models/src/vmware-k8s-1.28/mod.rs rename to sources/models/src/vmware-k8s-1.29/mod.rs diff --git a/variants/Cargo.lock b/variants/Cargo.lock index 99e43a1cb71..6c8fab9a3d1 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -259,6 +259,33 @@ dependencies = [ "release", ] +[[package]] +name = "aws-k8s-1_29" +version = "0.1.0" +dependencies = [ + "aws-iam-authenticator", + "cni", + "cni-plugins", + "kernel-6_1", + "kubernetes-1_29", + "release", +] + +[[package]] +name = "aws-k8s-1_29-nvidia" +version = "0.1.0" +dependencies = [ + "aws-iam-authenticator", + "cni", + "cni-plugins", + "kernel-6_1", + "kmod-6_1-nvidia", + "kubernetes-1_29", + "nvidia-container-toolkit", + "nvidia-k8s-device-plugin", + "release", +] + [[package]] name = "aws-signing-helper" version = "0.1.0" @@ -617,6 +644,15 @@ dependencies = [ "glibc", ] +[[package]] +name = "kubernetes-1_29" +version = "0.1.0" +dependencies = [ + "aws-signing-helper", + "ecr-credential-provider-1_27", + "glibc", +] + [[package]] name = "libacl" version = "0.1.0" @@ -987,6 +1023,18 @@ dependencies = [ "release", ] +[[package]] +name = "metal-k8s-1_29" +version = "0.1.0" +dependencies = [ + "aws-iam-authenticator", + "cni", + "cni-plugins", + "kernel-6_1", + "kubernetes-1_29", + "release", +] + [[package]] name = "microcode" version = "0.1.0" @@ -1230,6 +1278,18 @@ dependencies = [ "release", ] +[[package]] +name = "vmware-k8s-1_29" +version = "0.1.0" +dependencies = [ + "cni", + "cni-plugins", + "kernel-6_1", + "kubernetes-1_29", + "open-vm-tools", + "release", +] + [[package]] name = "wicked" version = "0.1.0" diff --git a/variants/Cargo.toml b/variants/Cargo.toml index 43230095603..4e4e8c83182 100644 --- a/variants/Cargo.toml +++ b/variants/Cargo.toml @@ -16,20 +16,24 @@ members = [ "aws-k8s-1.26-nvidia", "aws-k8s-1.27", "aws-k8s-1.28", + "aws-k8s-1.29", "aws-k8s-1.27-nvidia", "aws-k8s-1.28-nvidia", + "aws-k8s-1.29-nvidia", "metal-dev", "metal-k8s-1.24", "metal-k8s-1.25", "metal-k8s-1.26", "metal-k8s-1.27", "metal-k8s-1.28", + "metal-k8s-1.29", "vmware-dev", "vmware-k8s-1.24", "vmware-k8s-1.25", "vmware-k8s-1.26", "vmware-k8s-1.27", "vmware-k8s-1.28", + "vmware-k8s-1.29", ] [profile.dev] diff --git a/variants/README.md b/variants/README.md index a5969a2b279..ee38edbe698 100644 --- a/variants/README.md +++ b/variants/README.md @@ -125,6 +125,21 @@ It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazo This variant is compatible with Kubernetes 1.28, 1.29, 1.30, and 1.31 clusters. +### aws-k8s-1.29: Kubernetes 1.29 node + +The [aws-k8s-1.29](aws-k8s-1.29/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. +It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant is compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. + +### aws-k8s-1.29-nvidia: Kubernetes 1.29 NVIDIA node + +The [aws-k8s-1.29-nvidia](aws-k8s-1.29-nvidia/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. +It also includes the required packages to configure containers to leverage NVIDIA GPUs. +It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant is compatible with Kubernetes 1.29, 1.30, 1.31 and 1.32 clusters. + ### aws-ecs-1: Amazon ECS container instance The [aws-ecs-1](aws-ecs-1/Cargo.toml) variant includes the packages needed to run an [Amazon ECS](https://ecs.aws) @@ -188,11 +203,18 @@ This variant is compatible with Kubernetes 1.27, 1.28, 1.29, and 1.30 clusters. ## vmware-k8s-1.28: VMware Kubernetes 1.28 node -The [vmware-k8s-1.27](vmware-k8s-1.28/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. +The [vmware-k8s-1.28](vmware-k8s-1.28/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. It supports self-hosted clusters. This variant is compatible with Kubernetes 1.28, 1.29, 1.30 and 1.31 clusters. +## vmware-k8s-1.29: VMware Kubernetes 1.29 node + +The [vmware-k8s-1.29](vmware-k8s-1.29/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. +It supports self-hosted clusters. + +This variant is compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. + ### metal-dev: Metal development build The [metal-dev](metal-dev/Cargo.toml) variant has useful packages for local development of the OS and is intended to run bare metal. @@ -233,6 +255,13 @@ It supports self-hosted clusters. This variant is compatible with Kubernetes 1.28, 1.29, 1.30, and 1.31 clusters. +### metal-k8s-1.29: Metal Kubernetes 1.28 node + +The [metal-k8s-1.29](metal-k8s-1.29/Cargo.toml) variant includes the packages needed to run a Kubernetes node on bare metal. +It supports self-hosted clusters. + +This variant is compatible with Kubernetes 1.29, 1.30, 1.31, and 1.32 clusters. + ### Deprecated variants #### aws-k8s-1.15: Kubernetes 1.15 node diff --git a/variants/aws-k8s-1.29-nvidia/Cargo.toml b/variants/aws-k8s-1.29-nvidia/Cargo.toml new file mode 100644 index 00000000000..3fcf477bf17 --- /dev/null +++ b/variants/aws-k8s-1.29-nvidia/Cargo.toml @@ -0,0 +1,60 @@ +[package] +# This is the aws-k8s-1.29-nvidia variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_29-nvidia" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[package.metadata.build-variant.image-layout] +os-image-size-gib = 4 + +[package.metadata.build-variant.image-features] +grub-set-private-var = true +unified-cgroup-hierarchy = true +uefi-secure-boot = true +xfs-data-partition = true +systemd-networkd = true + +[package.metadata.build-variant] +included-packages = [ + # core + "release", + "kernel-6.1", + # k8s + "cni", + "cni-plugins", + "kubelet-1.29", + "aws-iam-authenticator", + # nvidia + "nvidia-container-toolkit", + "nvidia-k8s-device-plugin", + "kmod-6.1-nvidia-tesla-535", +] +kernel-parameters = [ + "console=tty0", + "console=ttyS0,115200n8", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "quiet", +] + +[lib] +path = "../variants.rs" + +[build-dependencies] +# core +release = { path = "../../packages/release" } +kernel-6_1 = { path = "../../packages/kernel-6.1" } +# k8s +cni = { path = "../../packages/cni" } +cni-plugins = { path = "../../packages/cni-plugins" } +kubernetes-1_29 = { path = "../../packages/kubernetes-1.29" } +aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" } +# nvidia +nvidia-container-toolkit = { path = "../../packages/nvidia-container-toolkit" } +nvidia-k8s-device-plugin = { path = "../../packages/nvidia-k8s-device-plugin" } +kmod-6_1-nvidia = { path = "../../packages/kmod-6.1-nvidia" } diff --git a/variants/aws-k8s-1.29/Cargo.toml b/variants/aws-k8s-1.29/Cargo.toml new file mode 100644 index 00000000000..84dbe5be152 --- /dev/null +++ b/variants/aws-k8s-1.29/Cargo.toml @@ -0,0 +1,49 @@ +[package] +# This is the aws-k8s-1.29 variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_29" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[package.metadata.build-variant.image-features] +grub-set-private-var = true +unified-cgroup-hierarchy = true +uefi-secure-boot = true +xfs-data-partition = true +systemd-networkd = true + +[package.metadata.build-variant] +included-packages = [ +# core + "release", + "kernel-6.1", +# k8s + "cni", + "cni-plugins", + "kubelet-1.29", + "aws-iam-authenticator", +] +kernel-parameters = [ + "console=tty0", + "console=ttyS0,115200n8", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "quiet", +] + +[lib] +path = "../variants.rs" + +[build-dependencies] +# core +release = { path = "../../packages/release" } +kernel-6_1 = { path = "../../packages/kernel-6.1" } +# k8s +cni = { path = "../../packages/cni" } +cni-plugins = { path = "../../packages/cni-plugins" } +kubernetes-1_29 = { path = "../../packages/kubernetes-1.29" } +aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" } diff --git a/variants/metal-k8s-1.29/Cargo.toml b/variants/metal-k8s-1.29/Cargo.toml new file mode 100644 index 00000000000..467e223fbad --- /dev/null +++ b/variants/metal-k8s-1.29/Cargo.toml @@ -0,0 +1,52 @@ +[package] +# This is the metal-k8s-1.29 variant. "." is not allowed in crate names, but +# we don't use this crate name anywhere. +name = "metal-k8s-1_29" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[package.metadata.build-variant.image-layout] +os-image-size-gib = 4 +partition-plan = "unified" + +[package.metadata.build-variant.image-features] +grub-set-private-var = true +unified-cgroup-hierarchy = true +uefi-secure-boot = true +xfs-data-partition = true +systemd-networkd = true + +[package.metadata.build-variant] +image-format = "raw" +supported-arches = ["x86_64"] +kernel-parameters = [ + # Only reserve if there are at least 2GB + "crashkernel=2G-:256M" +] +included-packages = [ + # core + "release", + "kernel-6.1", + # k8s + "aws-iam-authenticator", + "cni", + "cni-plugins", + "kubelet-1.29", +] + +[lib] +path = "../variants.rs" + +[build-dependencies] +# core +release = { path = "../../packages/release" } +kernel-6_1 = { path = "../../packages/kernel-6.1" } +# k8s +aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" } +cni = { path = "../../packages/cni" } +cni-plugins = { path = "../../packages/cni-plugins" } +kubernetes-1_29 = { path = "../../packages/kubernetes-1.29" } diff --git a/variants/vmware-k8s-1.29/Cargo.toml b/variants/vmware-k8s-1.29/Cargo.toml new file mode 100644 index 00000000000..71fa80abb92 --- /dev/null +++ b/variants/vmware-k8s-1.29/Cargo.toml @@ -0,0 +1,57 @@ +[package] +# This is the vmware-k8s-1.29 variant. "." is not allowed in crate names, but +# we don't use this crate name anywhere. +name = "vmware-k8s-1_29" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" +# Don't rebuild crate just because of changes to README. +exclude = ["README.md"] + +[package.metadata.build-variant.image-layout] +partition-plan = "unified" + +[package.metadata.build-variant.image-features] +grub-set-private-var = true +unified-cgroup-hierarchy = true +uefi-secure-boot = true +xfs-data-partition = true +systemd-networkd = true + +[package.metadata.build-variant] +image-format = "vmdk" +supported-arches = ["x86_64"] +kernel-parameters = [ + "console=tty1", + # Only reserve if there are at least 2GB + "crashkernel=2G-:256M", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "quiet", +] +included-packages = [ + # core + "release", + "kernel-6.1", + # k8s + "cni", + "cni-plugins", + "kubelet-1.29", + # vmware + "open-vm-tools", +] + +[lib] +path = "../variants.rs" + +[build-dependencies] +# core +release = { path = "../../packages/release" } +kernel-6_1 = { path = "../../packages/kernel-6.1" } +# k8s +cni = { path = "../../packages/cni" } +cni-plugins = { path = "../../packages/cni-plugins" } +kubernetes-1_29 = { path = "../../packages/kubernetes-1.29" } +# vmware +open-vm-tools = { path = "../../packages/open-vm-tools" } diff --git a/variants/vmware-k8s-1.29/template.ovf b/variants/vmware-k8s-1.29/template.ovf new file mode 120000 index 00000000000..db70bac6f1b --- /dev/null +++ b/variants/vmware-k8s-1.29/template.ovf @@ -0,0 +1 @@ +../shared/template-unified-secboot.ovf \ No newline at end of file From aa6480665d8cbd833541f083613d859f28463d0f Mon Sep 17 00:00:00 2001 From: Tianhao Geng Date: Thu, 4 Jan 2024 19:10:22 +0000 Subject: [PATCH 2/2] Add ecr-credential-provider-1.29 package --- .../ecr-credential-provider-1.29/Cargo.toml | 24 ++++++++++ .../ecr-credential-provider-1.29/clarify.toml | 5 +++ .../ecr-credential-provider-1.29.spec | 45 +++++++++++++++++++ packages/kubernetes-1.29/kubernetes-1.29.spec | 2 +- variants/Cargo.lock | 9 +++- 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 packages/ecr-credential-provider-1.29/Cargo.toml create mode 100644 packages/ecr-credential-provider-1.29/clarify.toml create mode 100644 packages/ecr-credential-provider-1.29/ecr-credential-provider-1.29.spec diff --git a/packages/ecr-credential-provider-1.29/Cargo.toml b/packages/ecr-credential-provider-1.29/Cargo.toml new file mode 100644 index 00000000000..0472c08c487 --- /dev/null +++ b/packages/ecr-credential-provider-1.29/Cargo.toml @@ -0,0 +1,24 @@ +[package] +# "." is not allowed in crate names, but we want a friendlier name for the +# directory and spec file, so we override it below. +name = "ecr-credential-provider-1_29" +version = "0.1.0" +edition = "2021" +publish = false +build = "../build.rs" + +[lib] +path = "../packages.rs" + +[package.metadata.build-package] +package-name = "ecr-credential-provider-1.29" +releases-url = "https://github.com/kubernetes/cloud-provider-aws/releases" + +[[package.metadata.build-package.external-files]] +url = "https://codeload.github.com/kubernetes/cloud-provider-aws/tar.gz/v1.29.0" +path = "cloud-provider-aws-1.29.0.tar.gz" +sha512 = "30b08ca55d182de4b2289f58acf0af4476cbeff74ea2668d7e9d4c53e2fdbb38016d7cf434a55bba895230255a699233d4484333b5b516c16acb0515df514876" +bundle-modules = [ "go" ] + +[build-dependencies] +glibc = { path = "../glibc" } diff --git a/packages/ecr-credential-provider-1.29/clarify.toml b/packages/ecr-credential-provider-1.29/clarify.toml new file mode 100644 index 00000000000..3fa231bd3ec --- /dev/null +++ b/packages/ecr-credential-provider-1.29/clarify.toml @@ -0,0 +1,5 @@ +[clarify."sigs.k8s.io/yaml"] +expression = "MIT AND BSD-3-Clause" +license-files = [ + { path = "LICENSE", hash = 0xcdf3ae00 }, +] diff --git a/packages/ecr-credential-provider-1.29/ecr-credential-provider-1.29.spec b/packages/ecr-credential-provider-1.29/ecr-credential-provider-1.29.spec new file mode 100644 index 00000000000..ad98fd3c59a --- /dev/null +++ b/packages/ecr-credential-provider-1.29/ecr-credential-provider-1.29.spec @@ -0,0 +1,45 @@ +%global goproject github.com/kubernetes +%global gorepo cloud-provider-aws +%global goimport %{goproject}/%{gorepo} + +%global gover 1.29.0 +%global rpmver %{gover} + +%global _dwz_low_mem_die_limit 0 + +Name: %{_cross_os}ecr-credential-provider-1.29 +Version: %{rpmver} +Release: 1%{?dist} +Summary: Container image registry credential provider for AWS ECR +License: Apache-2.0 +URL: https://github.com/kubernetes/cloud-provider-aws + +Source: cloud-provider-aws-%{gover}.tar.gz +Source1: bundled-cloud-provider-aws-%{gover}.tar.gz +Source1000: clarify.toml + +BuildRequires: %{_cross_os}glibc-devel + +%description +%{summary}. + +%prep +%setup -n %{gorepo}-%{gover} -q +%setup -T -D -n %{gorepo}-%{gover} -b 1 -q + +%build +%set_cross_go_flags + +go build -buildmode=pie -ldflags="${GOLDFLAGS}" -o=ecr-credential-provider cmd/ecr-credential-provider/*.go + +%install +install -d %{buildroot}%{_cross_libexecdir}/kubernetes/kubelet/plugins +install -p -m 0755 ecr-credential-provider %{buildroot}%{_cross_libexecdir}/kubernetes/kubelet/plugins/ecr-credential-provider + +%cross_scan_attribution --clarify %{S:1000} go-vendor vendor + +%files +%license LICENSE +%{_cross_attribution_file} +%{_cross_attribution_vendor_dir} +%{_cross_libexecdir}/kubernetes/kubelet/plugins/ecr-credential-provider diff --git a/packages/kubernetes-1.29/kubernetes-1.29.spec b/packages/kubernetes-1.29/kubernetes-1.29.spec index d8a139a6eb6..cc8a6b93505 100644 --- a/packages/kubernetes-1.29/kubernetes-1.29.spec +++ b/packages/kubernetes-1.29/kubernetes-1.29.spec @@ -68,7 +68,7 @@ Summary: Container cluster node agent Requires: %{_cross_os}conntrack-tools Requires: %{_cross_os}containerd Requires: %{_cross_os}findutils -Requires: %{_cross_os}ecr-credential-provider-1.27 +Requires: %{_cross_os}ecr-credential-provider-1.29 Requires: %{_cross_os}aws-signing-helper %description -n %{_cross_os}kubelet-1.29 diff --git a/variants/Cargo.lock b/variants/Cargo.lock index 6c8fab9a3d1..cf43f7a12aa 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -435,6 +435,13 @@ dependencies = [ "glibc", ] +[[package]] +name = "ecr-credential-provider-1_29" +version = "0.1.0" +dependencies = [ + "glibc", +] + [[package]] name = "ecs-agent" version = "0.1.0" @@ -649,7 +656,7 @@ name = "kubernetes-1_29" version = "0.1.0" dependencies = [ "aws-signing-helper", - "ecr-credential-provider-1_27", + "ecr-credential-provider-1_29", "glibc", ]