diff --git a/BUILDING.md b/BUILDING.md index c79b8c6f0dc..d4f5f1b2f61 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -150,7 +150,7 @@ cargo make -e BUILDSYS_UPSTREAM_LICENSE_FETCH=true fetch-licenses 3. Build your image, setting the `BUILDSYS_UPSTREAM_SOURCE_FALLBACK` flag to `true`, if you haven't cached the driver's sources: ```shell -K8S_VERSION=1.22 +K8S_VERSION=1.24 cargo make \ -e BUILDSYS_VARIANT=aws-k8s-${K8S_VERSION}-nvidia \ -e BUILDSYS_UPSTREAM_SOURCE_FALLBACK="true" diff --git a/README.md b/README.md index e10371c76b1..17b6ff47e83 100644 --- a/README.md +++ b/README.md @@ -60,13 +60,11 @@ For example, an `x86_64` build of the `aws-k8s-1.24` variant will produce an ima The following variants support EKS, as described above: -* `aws-k8s-1.22` * `aws-k8s-1.23` * `aws-k8s-1.24` * `aws-k8s-1.25` * `aws-k8s-1.26` * `aws-k8s-1.27` -* `aws-k8s-1.22-nvidia` * `aws-k8s-1.23-nvidia` * `aws-k8s-1.24-nvidia` * `aws-k8s-1.25-nvidia` @@ -80,7 +78,6 @@ The following variants support ECS: We also have variants that are designed to be Kubernetes worker nodes in VMware: -* `vmware-k8s-1.22` * `vmware-k8s-1.23` * `vmware-k8s-1.24` * `vmware-k8s-1.25` @@ -89,7 +86,6 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware: The following variants are designed to be Kubernetes worker nodes on bare metal: -* `metal-k8s-1.22` * `metal-k8s-1.23` * `metal-k8s-1.24` * `metal-k8s-1.25` @@ -98,7 +94,7 @@ The following variants are designed to be Kubernetes worker nodes on bare metal: The following variants are no longer supported: -* All Kubernetes variants using Kubernetes 1.21 and earlier +* All Kubernetes variants using Kubernetes 1.22 and earlier We recommend users replace nodes running these variants with the [latest variant compatible with their cluster](variants/). diff --git a/packages/kubernetes-1.22/Cargo.toml b/packages/kubernetes-1.22/Cargo.toml deleted file mode 100644 index 1ccf469aadf..00000000000 --- a/packages/kubernetes-1.22/Cargo.toml +++ /dev/null @@ -1,32 +0,0 @@ -[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_22" -version = "0.1.0" -edition = "2021" -publish = false -build = "build.rs" - -[lib] -path = "pkg.rs" - -[package.metadata.build-package] -package-name = "kubernetes-1.22" - -[[package.metadata.build-package.external-files]] -url = "https://distro.eks.amazonaws.com/kubernetes-1-22/releases/19/artifacts/kubernetes/v1.22.17/kubernetes-src.tar.gz" -sha512 = "8a71caf9c490022fe3865bae21b49c56046598004dba524c12cf9ff7954585fb9f97c903539fd491229c0200437462aad46e388c34dd66d22dfa7461a47dfac4" - -# RPM BuildRequires -[build-dependencies] -glibc = { path = "../glibc" } - -# RPM Requires -[dependencies] -aws-signing-helper = { path = "../aws-signing-helper" } -ecr-credential-provider = { path = "../ecr-credential-provider" } -# `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.22/build.rs b/packages/kubernetes-1.22/build.rs deleted file mode 100644 index cad8999af53..00000000000 --- a/packages/kubernetes-1.22/build.rs +++ /dev/null @@ -1,9 +0,0 @@ -use std::process::{exit, Command}; - -fn main() -> Result<(), std::io::Error> { - let ret = Command::new("buildsys").arg("build-package").status()?; - if !ret.success() { - exit(1); - } - Ok(()) -} diff --git a/packages/kubernetes-1.22/clarify.toml b/packages/kubernetes-1.22/clarify.toml deleted file mode 100644 index 5b6e8b60967..00000000000 --- a/packages/kubernetes-1.22/clarify.toml +++ /dev/null @@ -1,62 +0,0 @@ -[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.22/credential-provider-config-yaml b/packages/kubernetes-1.22/credential-provider-config-yaml deleted file mode 100644 index 5c65440cd43..00000000000 --- a/packages/kubernetes-1.22/credential-provider-config-yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: kubelet.config.k8s.io/v1alpha1 -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/v1alpha1 -{{#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.22/etc-kubernetes-pki-private.mount b/packages/kubernetes-1.22/etc-kubernetes-pki-private.mount deleted file mode 100644 index 584e61475d1..00000000000 --- a/packages/kubernetes-1.22/etc-kubernetes-pki-private.mount +++ /dev/null @@ -1,16 +0,0 @@ -[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.22/kubelet-bootstrap-kubeconfig b/packages/kubernetes-1.22/kubelet-bootstrap-kubeconfig deleted file mode 100644 index 09e58523196..00000000000 --- a/packages/kubernetes-1.22/kubelet-bootstrap-kubeconfig +++ /dev/null @@ -1,22 +0,0 @@ ---- -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.22/kubelet-config b/packages/kubernetes-1.22/kubelet-config deleted file mode 100644 index 38888690d32..00000000000 --- a/packages/kubernetes-1.22/kubelet-config +++ /dev/null @@ -1,180 +0,0 @@ ---- -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}} -kubeAPIQPS: {{default 10 settings.kubernetes.kube-api-qps}} -kubeAPIBurst: {{default 20 settings.kubernetes.kube-api-burst}} -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}} -{{#if settings.kubernetes.pod-pids-limit includeZero=true}} -podPidsLimit: {{settings.kubernetes.pod-pids-limit}} -{{/if}} -{{#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: "/etc/resolv.conf" -hairpinMode: hairpin-veth -readOnlyPort: 0 -cgroupDriver: systemd -cgroupRoot: "/" -runtimeRequestTimeout: 15m -featureGates: - RotateKubeletServerCertificate: true - CSIMigration: false - KubeletCredentialProviders: true -protectKernelDefaults: true -serializeImagePulls: false -{{#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.22/kubelet-env b/packages/kubernetes-1.22/kubelet-env deleted file mode 100644 index 681726d0176..00000000000 --- a/packages/kubernetes-1.22/kubelet-env +++ /dev/null @@ -1,4 +0,0 @@ -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.22/kubelet-exec-start-conf b/packages/kubernetes-1.22/kubelet-exec-start-conf deleted file mode 100644 index 02851f420f2..00000000000 --- a/packages/kubernetes-1.22/kubelet-exec-start-conf +++ /dev/null @@ -1,35 +0,0 @@ -[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=remote \ - --container-runtime-endpoint=unix:///run/dockershim.sock \ - --containerd=/run/dockershim.sock \ - --network-plugin cni \ - --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.22/kubelet-kubeconfig b/packages/kubernetes-1.22/kubelet-kubeconfig deleted file mode 100644 index f39de0e6a8a..00000000000 --- a/packages/kubernetes-1.22/kubelet-kubeconfig +++ /dev/null @@ -1,39 +0,0 @@ ---- -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.22/kubelet-server-crt b/packages/kubernetes-1.22/kubelet-server-crt deleted file mode 100644 index 21af4222ea2..00000000000 --- a/packages/kubernetes-1.22/kubelet-server-crt +++ /dev/null @@ -1,3 +0,0 @@ -{{~#if settings.kubernetes.server-certificate~}} -{{base64_decode settings.kubernetes.server-certificate}} -{{~/if~}} diff --git a/packages/kubernetes-1.22/kubelet-server-key b/packages/kubernetes-1.22/kubelet-server-key deleted file mode 100644 index 0310e76ddd8..00000000000 --- a/packages/kubernetes-1.22/kubelet-server-key +++ /dev/null @@ -1,3 +0,0 @@ -{{~#if settings.kubernetes.server-key~}} -{{base64_decode settings.kubernetes.server-key}} -{{~/if~}} diff --git a/packages/kubernetes-1.22/kubelet-sysctl.conf b/packages/kubernetes-1.22/kubelet-sysctl.conf deleted file mode 100644 index ed68c7e197f..00000000000 --- a/packages/kubernetes-1.22/kubelet-sysctl.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Overcommit handling mode - 1: Always overcommit -vm.overcommit_memory = 1 diff --git a/packages/kubernetes-1.22/kubelet.service b/packages/kubernetes-1.22/kubelet.service deleted file mode 100644 index 1285853f2d1..00000000000 --- a/packages/kubernetes-1.22/kubelet.service +++ /dev/null @@ -1,26 +0,0 @@ -[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.22/kubernetes-1.22.spec b/packages/kubernetes-1.22/kubernetes-1.22.spec deleted file mode 100644 index f851e77c31f..00000000000 --- a/packages/kubernetes-1.22/kubernetes-1.22.spec +++ /dev/null @@ -1,151 +0,0 @@ -%global goproject github.com/kubernetes -%global gorepo kubernetes -%global goimport %{goproject}/%{gorepo} - -%global gover 1.22.17 -%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-22/releases/19/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 - -# ExecStartPre drop-ins -Source20: prestart-pull-pause-ctr.conf -Source21: make-kubelet-dirs.conf -Source22: load-ipvs-modules.conf - -Source1000: clarify.toml - -BuildRequires: git -BuildRequires: rsync -BuildRequires: %{_cross_os}glibc-devel - -%description -%{summary}. - -%package -n %{_cross_os}kubelet-1.22 -Summary: Container cluster node agent -Requires: %{_cross_os}conntrack-tools -Requires: %{_cross_os}containerd -Requires: %{_cross_os}findutils -Requires: %{_cross_os}ecr-credential-provider -Requires: %{_cross_os}aws-signing-helper - -%description -n %{_cross_os}kubelet-1.22 -%{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 generated_files - -# 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 - -%files -n %{_cross_os}kubelet-1.22 -%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/load-ipvs-modules.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 - -%changelog diff --git a/packages/kubernetes-1.22/kubernetes-ca-crt b/packages/kubernetes-1.22/kubernetes-ca-crt deleted file mode 100644 index ab82c485f56..00000000000 --- a/packages/kubernetes-1.22/kubernetes-ca-crt +++ /dev/null @@ -1,3 +0,0 @@ -{{~#if settings.kubernetes.cluster-certificate~}} -{{base64_decode settings.kubernetes.cluster-certificate}} -{{~/if~}} diff --git a/packages/kubernetes-1.22/kubernetes-tmpfiles.conf b/packages/kubernetes-1.22/kubernetes-tmpfiles.conf deleted file mode 100644 index 15c1deec646..00000000000 --- a/packages/kubernetes-1.22/kubernetes-tmpfiles.conf +++ /dev/null @@ -1,5 +0,0 @@ -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.22/load-ipvs-modules.conf b/packages/kubernetes-1.22/load-ipvs-modules.conf deleted file mode 100644 index e895782bdfb..00000000000 --- a/packages/kubernetes-1.22/load-ipvs-modules.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Wants=modprobe@ip_vs_sh.service modprobe@ip_vs_rr.service modprobe@ip_vs_wrr.service -After=modprobe@ip_vs_sh.service modprobe@ip_vs_rr.service modprobe@ip_vs_wrr.service diff --git a/packages/kubernetes-1.22/make-kubelet-dirs.conf b/packages/kubernetes-1.22/make-kubelet-dirs.conf deleted file mode 100644 index a7249c9ac3f..00000000000 --- a/packages/kubernetes-1.22/make-kubelet-dirs.conf +++ /dev/null @@ -1,5 +0,0 @@ -[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.22/pkg.rs b/packages/kubernetes-1.22/pkg.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/packages/kubernetes-1.22/pkg.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/packages/kubernetes-1.22/prepare-var-lib-kubelet.service b/packages/kubernetes-1.22/prepare-var-lib-kubelet.service deleted file mode 100644 index 1b8c6207aa4..00000000000 --- a/packages/kubernetes-1.22/prepare-var-lib-kubelet.service +++ /dev/null @@ -1,23 +0,0 @@ -[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.22/prestart-pull-pause-ctr.conf b/packages/kubernetes-1.22/prestart-pull-pause-ctr.conf deleted file mode 100644 index 309a23c3c5b..00000000000 --- a/packages/kubernetes-1.22/prestart-pull-pause-ctr.conf +++ /dev/null @@ -1,9 +0,0 @@ -[Service] -# Pull the pause container image before starting `kubelet` so `containerd/cri` wouldn't have to -ExecStartPre=/usr/bin/host-ctr \ - --containerd-socket=/run/dockershim.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/logdog/conf/logdog.aws-k8s-1.22-nvidia.conf b/sources/logdog/conf/logdog.aws-k8s-1.22-nvidia.conf deleted file mode 120000 index 63115aee60b..00000000000 --- a/sources/logdog/conf/logdog.aws-k8s-1.22-nvidia.conf +++ /dev/null @@ -1 +0,0 @@ -aws-k8s.conf \ No newline at end of file diff --git a/sources/logdog/conf/logdog.aws-k8s-1.22.conf b/sources/logdog/conf/logdog.aws-k8s-1.22.conf deleted file mode 120000 index 63115aee60b..00000000000 --- a/sources/logdog/conf/logdog.aws-k8s-1.22.conf +++ /dev/null @@ -1 +0,0 @@ -aws-k8s.conf \ No newline at end of file diff --git a/sources/logdog/conf/logdog.metal-k8s-1.22.conf b/sources/logdog/conf/logdog.metal-k8s-1.22.conf deleted file mode 120000 index 7134ec8b998..00000000000 --- a/sources/logdog/conf/logdog.metal-k8s-1.22.conf +++ /dev/null @@ -1 +0,0 @@ -k8s.conf \ No newline at end of file diff --git a/sources/logdog/conf/logdog.vmware-k8s-1.22.conf b/sources/logdog/conf/logdog.vmware-k8s-1.22.conf deleted file mode 120000 index 7134ec8b998..00000000000 --- a/sources/logdog/conf/logdog.vmware-k8s-1.22.conf +++ /dev/null @@ -1 +0,0 @@ -k8s.conf \ No newline at end of file diff --git a/sources/models/README.md b/sources/models/README.md index 95cec9b341d..e95d873d2c1 100644 --- a/sources/models/README.md +++ b/sources/models/README.md @@ -22,16 +22,6 @@ Entries are sorted by filename, and later entries take precedence. The `#[model]` attribute on Settings and its sub-structs reduces duplication and adds some required metadata; see [its docs](model-derive/) for details. -### aws-k8s-1.22: Kubernetes 1.22 - -* [Model](src/aws-k8s-1.22/mod.rs) -* [Default settings](src/aws-k8s-1.22/defaults.d/) - -### aws-k8s-1.22-nvidia: Kubernetes 1.22 NVIDIA - -* [Model](src/aws-k8s-1.22-nvidia/mod.rs) -* [Default settings](src/aws-k8s-1.22-nvidia/defaults.d/) - ### aws-k8s-1.23: Kubernetes 1.23 * [Model](src/aws-k8s-1.25/mod.rs) @@ -97,11 +87,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and * [Model](src/vmware-dev/mod.rs) * [Default settings](src/vmware-dev/defaults.d/) -### vmware-k8s-1.22: VMware Kubernetes 1.22 - -* [Model](src/vmware-k8s-1.22/mod.rs) -* [Default settings](src/vmware-k8s-1.22/defaults.d/) - ### vmware-k8s-1.23: VMware Kubernetes 1.23 * [Model](src/vmware-k8s-1.27/mod.rs) @@ -132,11 +117,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and * [Model](src/metal-dev/mod.rs) * [Default settings](src/metal-dev/defaults.d/) -### metal-k8s-1.22: Metal Kubernetes 1.22 - -* [Model](src/metal-k8s-1.22/mod.rs) -* [Default settings](src/metal-k8s-1.22/defaults.d/) - ### metal-k8s-1.23: Metal Kubernetes 1.23 * [Model](src/metal-k8s-1.27/mod.rs) diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/10-defaults.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/10-defaults.toml deleted file mode 120000 index a202ba61a4c..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/10-defaults.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/15-aws-tuf.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/15-aws-tuf.toml deleted file mode 120000 index afcef6a617e..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/15-aws-tuf.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-tuf.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/20-aws-host-containers.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/20-aws-host-containers.toml deleted file mode 120000 index 4d404d663cd..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/20-aws-host-containers.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-host-containers.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/25-cf-signal.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/25-cf-signal.toml deleted file mode 120000 index a33d541652c..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/25-cf-signal.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/cf-signal.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/26-aws-autoscaling.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/26-aws-autoscaling.toml deleted file mode 120000 index b579c0182b6..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/26-aws-autoscaling.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-autoscaling.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/30-metrics.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/30-metrics.toml deleted file mode 120000 index 99f0b2b6980..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/30-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/31-send-metrics-aws.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/31-send-metrics-aws.toml deleted file mode 120000 index 2fefefea751..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/31-send-metrics-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/send-metrics-aws.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/40-aws-creds.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/40-aws-creds.toml deleted file mode 120000 index a6a17e88f54..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/40-aws-creds.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/50-kubernetes-aws.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/50-kubernetes-aws.toml deleted file mode 120000 index 7393a2dd3d1..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/50-kubernetes-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-aws.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/51-kubernetes-containerd-nvidia-dockershim.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/51-kubernetes-containerd-nvidia-dockershim.toml deleted file mode 120000 index ee0564393b6..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/51-kubernetes-containerd-nvidia-dockershim.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-containerd-nvidia-dockershim.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/52-kubernetes-services.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/52-kubernetes-services.toml deleted file mode 120000 index afab5a7f15a..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/52-kubernetes-services.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/53-containerd-cri-pki.toml deleted file mode 120000 index 2dbf7db789b..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/53-containerd-cri-pki.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/60-lockdown-none.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/60-lockdown-none.toml deleted file mode 120000 index cced543330e..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/60-lockdown-none.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/lockdown-none.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/70-oci-hooks.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/70-oci-hooks.toml deleted file mode 120000 index d91eec45282..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/70-oci-hooks.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/nvidia-oci-hooks-containerd-cri.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml deleted file mode 120000 index 25204d67d21..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/76-oci-defaults-containerd-cri-capabilities.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/76-oci-defaults-containerd-cri-capabilities.toml deleted file mode 120000 index 2e5d1c32f8d..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/76-oci-defaults-containerd-cri-capabilities.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-capabilities.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml deleted file mode 120000 index 7f06213572a..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22-nvidia/mod.rs b/sources/models/src/aws-k8s-1.22-nvidia/mod.rs deleted file mode 100644 index d67d934ba97..00000000000 --- a/sources/models/src/aws-k8s-1.22-nvidia/mod.rs +++ /dev/null @@ -1,33 +0,0 @@ -use crate::modeled_types::Identifier; -use crate::{ - AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, DnsSettings, - HostContainer, KernelSettings, KubernetesSettings, MetricsSettings, NetworkSettings, - NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings, -}; - -use model_derive::model; -use serde::{Deserialize, Serialize}; -use std::collections::HashMap; - -// Note: we have to use 'rename' here because the top-level Settings structure is the only one -// that uses its name in serialization; internal structures use the field name that points to it -#[model(rename = "settings", impl_default = true)] -struct Settings { - motd: String, - kubernetes: KubernetesSettings, - updates: UpdatesSettings, - host_containers: HashMap, - bootstrap_containers: HashMap, - ntp: NtpSettings, - network: NetworkSettings, - kernel: KernelSettings, - aws: AwsSettings, - metrics: MetricsSettings, - pki: HashMap, - container_registry: RegistrySettings, - oci_defaults: OciDefaults, - oci_hooks: OciHooks, - cloudformation: CloudFormationSettings, - dns: DnsSettings, - autoscaling: AutoScalingSettings, -} diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/10-defaults.toml b/sources/models/src/aws-k8s-1.22/defaults.d/10-defaults.toml deleted file mode 120000 index a202ba61a4c..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/10-defaults.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/15-aws-tuf.toml b/sources/models/src/aws-k8s-1.22/defaults.d/15-aws-tuf.toml deleted file mode 120000 index afcef6a617e..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/15-aws-tuf.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-tuf.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/20-aws-host-containers.toml b/sources/models/src/aws-k8s-1.22/defaults.d/20-aws-host-containers.toml deleted file mode 120000 index 4d404d663cd..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/20-aws-host-containers.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-host-containers.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/25-cf-signal.toml b/sources/models/src/aws-k8s-1.22/defaults.d/25-cf-signal.toml deleted file mode 120000 index a33d541652c..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/25-cf-signal.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/cf-signal.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/26-aws-autoscaling.toml b/sources/models/src/aws-k8s-1.22/defaults.d/26-aws-autoscaling.toml deleted file mode 120000 index b579c0182b6..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/26-aws-autoscaling.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-autoscaling.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/30-metrics.toml b/sources/models/src/aws-k8s-1.22/defaults.d/30-metrics.toml deleted file mode 120000 index 99f0b2b6980..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/30-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/31-send-metrics-aws.toml b/sources/models/src/aws-k8s-1.22/defaults.d/31-send-metrics-aws.toml deleted file mode 120000 index 2fefefea751..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/31-send-metrics-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/send-metrics-aws.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/40-aws-creds.toml b/sources/models/src/aws-k8s-1.22/defaults.d/40-aws-creds.toml deleted file mode 120000 index a6a17e88f54..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/40-aws-creds.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/50-kubernetes-aws.toml b/sources/models/src/aws-k8s-1.22/defaults.d/50-kubernetes-aws.toml deleted file mode 120000 index 7393a2dd3d1..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/50-kubernetes-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-aws.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml b/sources/models/src/aws-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml deleted file mode 120000 index 672b44260f8..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-containerd-dockershim.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/52-kubernetes-services.toml b/sources/models/src/aws-k8s-1.22/defaults.d/52-kubernetes-services.toml deleted file mode 120000 index afab5a7f15a..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/52-kubernetes-services.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/aws-k8s-1.22/defaults.d/53-containerd-cri-pki.toml deleted file mode 120000 index 2dbf7db789b..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/53-containerd-cri-pki.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/60-lockdown-integrity.toml b/sources/models/src/aws-k8s-1.22/defaults.d/60-lockdown-integrity.toml deleted file mode 120000 index 8b4de873a39..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/60-lockdown-integrity.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/lockdown-integrity.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/70-oci-hooks.toml b/sources/models/src/aws-k8s-1.22/defaults.d/70-oci-hooks.toml deleted file mode 120000 index e7b73c620dd..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/70-oci-hooks.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/models/src/aws-k8s-1.22/defaults.d/75-oci-defaults-containerd-cri.toml deleted file mode 120000 index 25204d67d21..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/75-oci-defaults-containerd-cri.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/76-oci-defaults-containerd-cri-capabilities.toml b/sources/models/src/aws-k8s-1.22/defaults.d/76-oci-defaults-containerd-cri-capabilities.toml deleted file mode 120000 index 2e5d1c32f8d..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/76-oci-defaults-containerd-cri-capabilities.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-capabilities.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/aws-k8s-1.22/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml deleted file mode 120000 index 7f06213572a..00000000000 --- a/sources/models/src/aws-k8s-1.22/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/models/src/aws-k8s-1.22/mod.rs b/sources/models/src/aws-k8s-1.22/mod.rs deleted file mode 100644 index 3570785b05e..00000000000 --- a/sources/models/src/aws-k8s-1.22/mod.rs +++ /dev/null @@ -1,35 +0,0 @@ -use crate::modeled_types::Identifier; -use crate::{ - AutoScalingSettings, AwsSettings, BootstrapContainer, CloudFormationSettings, - ContainerRuntimeSettings, DnsSettings, HostContainer, KernelSettings, KubernetesSettings, - MetricsSettings, NetworkSettings, NtpSettings, OciDefaults, OciHooks, PemCertificate, - RegistrySettings, UpdatesSettings, -}; - -use model_derive::model; -use serde::{Deserialize, Serialize}; -use std::collections::HashMap; - -// Note: we have to use 'rename' here because the top-level Settings structure is the only one -// that uses its name in serialization; internal structures use the field name that points to it -#[model(rename = "settings", impl_default = true)] -struct Settings { - motd: String, - kubernetes: KubernetesSettings, - updates: UpdatesSettings, - host_containers: HashMap, - bootstrap_containers: HashMap, - ntp: NtpSettings, - network: NetworkSettings, - kernel: KernelSettings, - aws: AwsSettings, - metrics: MetricsSettings, - pki: HashMap, - container_registry: RegistrySettings, - oci_defaults: OciDefaults, - oci_hooks: OciHooks, - cloudformation: CloudFormationSettings, - dns: DnsSettings, - container_runtime: ContainerRuntimeSettings, - autoscaling: AutoScalingSettings, -} diff --git a/sources/models/src/lib.rs b/sources/models/src/lib.rs index f9cf1d80b4d..e21ef2a108d 100644 --- a/sources/models/src/lib.rs +++ b/sources/models/src/lib.rs @@ -19,16 +19,6 @@ Entries are sorted by filename, and later entries take precedence. The `#[model]` attribute on Settings and its sub-structs reduces duplication and adds some required metadata; see [its docs](model-derive/) for details. -## aws-k8s-1.22: Kubernetes 1.22 - -* [Model](src/aws-k8s-1.22/mod.rs) -* [Default settings](src/aws-k8s-1.22/defaults.d/) - -## aws-k8s-1.22-nvidia: Kubernetes 1.22 NVIDIA - -* [Model](src/aws-k8s-1.22-nvidia/mod.rs) -* [Default settings](src/aws-k8s-1.22-nvidia/defaults.d/) - ## aws-k8s-1.23: Kubernetes 1.23 * [Model](src/aws-k8s-1.25/mod.rs) @@ -94,11 +84,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and * [Model](src/vmware-dev/mod.rs) * [Default settings](src/vmware-dev/defaults.d/) -## vmware-k8s-1.22: VMware Kubernetes 1.22 - -* [Model](src/vmware-k8s-1.22/mod.rs) -* [Default settings](src/vmware-k8s-1.22/defaults.d/) - ## vmware-k8s-1.23: VMware Kubernetes 1.23 * [Model](src/vmware-k8s-1.27/mod.rs) @@ -129,11 +114,6 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and * [Model](src/metal-dev/mod.rs) * [Default settings](src/metal-dev/defaults.d/) -## metal-k8s-1.22: Metal Kubernetes 1.22 - -* [Model](src/metal-k8s-1.22/mod.rs) -* [Default settings](src/metal-k8s-1.22/defaults.d/) - ## metal-k8s-1.23: Metal Kubernetes 1.23 * [Model](src/metal-k8s-1.27/mod.rs) diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/10-defaults.toml b/sources/models/src/metal-k8s-1.22/defaults.d/10-defaults.toml deleted file mode 120000 index a202ba61a4c..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/10-defaults.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/15-public-tuf.toml b/sources/models/src/metal-k8s-1.22/defaults.d/15-public-tuf.toml deleted file mode 120000 index 561a74dfd90..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/15-public-tuf.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/public-tuf.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/20-public-host-containers.toml b/sources/models/src/metal-k8s-1.22/defaults.d/20-public-host-containers.toml deleted file mode 120000 index 6119af1cfa3..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/20-public-host-containers.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/public-host-containers.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/30-metrics.toml b/sources/models/src/metal-k8s-1.22/defaults.d/30-metrics.toml deleted file mode 120000 index 99f0b2b6980..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/30-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/31-send-metrics.toml b/sources/models/src/metal-k8s-1.22/defaults.d/31-send-metrics.toml deleted file mode 120000 index d01b193f18d..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/31-send-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/send-metrics-global.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/40-aws-creds.toml b/sources/models/src/metal-k8s-1.22/defaults.d/40-aws-creds.toml deleted file mode 120000 index a6a17e88f54..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/40-aws-creds.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/50-kubernetes-metal.toml b/sources/models/src/metal-k8s-1.22/defaults.d/50-kubernetes-metal.toml deleted file mode 120000 index 3103e5cc9c1..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/50-kubernetes-metal.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-metal.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml b/sources/models/src/metal-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml deleted file mode 120000 index 672b44260f8..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-containerd-dockershim.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/52-kubernetes-services.toml b/sources/models/src/metal-k8s-1.22/defaults.d/52-kubernetes-services.toml deleted file mode 120000 index afab5a7f15a..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/52-kubernetes-services.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/metal-k8s-1.22/defaults.d/53-containerd-cri-pki.toml deleted file mode 120000 index 2dbf7db789b..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/53-containerd-cri-pki.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/60-lockdown-integrity.toml b/sources/models/src/metal-k8s-1.22/defaults.d/60-lockdown-integrity.toml deleted file mode 120000 index 8b4de873a39..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/60-lockdown-integrity.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/lockdown-integrity.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/70-public-ntp.toml b/sources/models/src/metal-k8s-1.22/defaults.d/70-public-ntp.toml deleted file mode 120000 index eb5f4bcd0a7..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/70-public-ntp.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/public-ntp.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/80-oci-hooks.toml b/sources/models/src/metal-k8s-1.22/defaults.d/80-oci-hooks.toml deleted file mode 120000 index e7b73c620dd..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/80-oci-hooks.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/85-oci-defaults-containerd-cri.toml b/sources/models/src/metal-k8s-1.22/defaults.d/85-oci-defaults-containerd-cri.toml deleted file mode 120000 index 25204d67d21..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/85-oci-defaults-containerd-cri.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/86-oci-defaults-containerd-cri-capabilities.toml b/sources/models/src/metal-k8s-1.22/defaults.d/86-oci-defaults-containerd-cri-capabilities.toml deleted file mode 120000 index 2e5d1c32f8d..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/86-oci-defaults-containerd-cri-capabilities.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-capabilities.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/metal-k8s-1.22/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml deleted file mode 120000 index 7f06213572a..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/defaults.d/90-boot.toml b/sources/models/src/metal-k8s-1.22/defaults.d/90-boot.toml deleted file mode 120000 index 7778447459a..00000000000 --- a/sources/models/src/metal-k8s-1.22/defaults.d/90-boot.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/boot.toml \ No newline at end of file diff --git a/sources/models/src/metal-k8s-1.22/mod.rs b/sources/models/src/metal-k8s-1.22/mod.rs deleted file mode 100644 index 4f4ee2ab5fa..00000000000 --- a/sources/models/src/metal-k8s-1.22/mod.rs +++ /dev/null @@ -1,33 +0,0 @@ -use model_derive::model; -use serde::{Deserialize, Serialize}; -use std::collections::HashMap; - -use crate::modeled_types::Identifier; -use crate::{ - AwsSettings, BootSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, - HostContainer, KernelSettings, KubernetesSettings, MetricsSettings, NetworkSettings, - NtpSettings, OciDefaults, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings, -}; - -// Note: we have to use 'rename' here because the top-level Settings structure is the only one -// that uses its name in serialization; internal structures use the field name that points to it -#[model(rename = "settings", impl_default = true)] -struct Settings { - motd: String, - kubernetes: KubernetesSettings, - updates: UpdatesSettings, - host_containers: HashMap, - bootstrap_containers: HashMap, - ntp: NtpSettings, - network: NetworkSettings, - kernel: KernelSettings, - boot: BootSettings, - aws: AwsSettings, - metrics: MetricsSettings, - pki: HashMap, - container_registry: RegistrySettings, - oci_defaults: OciDefaults, - oci_hooks: OciHooks, - dns: DnsSettings, - container_runtime: ContainerRuntimeSettings, -} diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/10-defaults.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/10-defaults.toml deleted file mode 120000 index a202ba61a4c..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/10-defaults.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/15-public-tuf.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/15-public-tuf.toml deleted file mode 120000 index 561a74dfd90..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/15-public-tuf.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/public-tuf.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/20-public-host-containers.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/20-public-host-containers.toml deleted file mode 120000 index 6119af1cfa3..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/20-public-host-containers.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/public-host-containers.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/30-metrics.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/30-metrics.toml deleted file mode 120000 index 99f0b2b6980..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/30-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/31-send-metrics.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/31-send-metrics.toml deleted file mode 120000 index d01b193f18d..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/31-send-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/send-metrics-global.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/40-aws-creds.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/40-aws-creds.toml deleted file mode 120000 index a6a17e88f54..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/40-aws-creds.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/50-kubernetes-vmware.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/50-kubernetes-vmware.toml deleted file mode 120000 index f67755f3b0a..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/50-kubernetes-vmware.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-vmware.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml deleted file mode 120000 index 672b44260f8..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/51-kubernetes-containerd-dockershim.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-containerd-dockershim.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/52-kubernetes-services.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/52-kubernetes-services.toml deleted file mode 120000 index afab5a7f15a..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/52-kubernetes-services.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/53-containerd-cri-pki.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/53-containerd-cri-pki.toml deleted file mode 120000 index 2dbf7db789b..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/53-containerd-cri-pki.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/60-lockdown-integrity.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/60-lockdown-integrity.toml deleted file mode 120000 index 8b4de873a39..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/60-lockdown-integrity.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/lockdown-integrity.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/70-public-ntp.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/70-public-ntp.toml deleted file mode 120000 index eb5f4bcd0a7..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/70-public-ntp.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/public-ntp.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/80-oci-hooks.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/80-oci-hooks.toml deleted file mode 120000 index e7b73c620dd..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/80-oci-hooks.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/85-oci-defaults-containerd-cri.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/85-oci-defaults-containerd-cri.toml deleted file mode 120000 index 25204d67d21..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/85-oci-defaults-containerd-cri.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/86-oci-defaults-containerd-cri-capabilities.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/86-oci-defaults-containerd-cri-capabilities.toml deleted file mode 120000 index 2e5d1c32f8d..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/86-oci-defaults-containerd-cri-capabilities.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-capabilities.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml b/sources/models/src/vmware-k8s-1.22/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml deleted file mode 120000 index 7f06213572a..00000000000 --- a/sources/models/src/vmware-k8s-1.22/defaults.d/87-oci-defaults-containerd-cri-resource-limits.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/models/src/vmware-k8s-1.22/mod.rs b/sources/models/src/vmware-k8s-1.22/mod.rs deleted file mode 100644 index 8d06cd24a3b..00000000000 --- a/sources/models/src/vmware-k8s-1.22/mod.rs +++ /dev/null @@ -1,32 +0,0 @@ -use model_derive::model; -use serde::{Deserialize, Serialize}; -use std::collections::HashMap; - -use crate::modeled_types::Identifier; -use crate::{ - AwsSettings, BootstrapContainer, ContainerRuntimeSettings, DnsSettings, HostContainer, - KernelSettings, KubernetesSettings, MetricsSettings, NetworkSettings, NtpSettings, OciDefaults, - OciHooks, PemCertificate, RegistrySettings, UpdatesSettings, -}; - -// Note: we have to use 'rename' here because the top-level Settings structure is the only one -// that uses its name in serialization; internal structures use the field name that points to it -#[model(rename = "settings", impl_default = true)] -struct Settings { - motd: String, - kubernetes: KubernetesSettings, - updates: UpdatesSettings, - host_containers: HashMap, - bootstrap_containers: HashMap, - ntp: NtpSettings, - network: NetworkSettings, - kernel: KernelSettings, - aws: AwsSettings, - metrics: MetricsSettings, - pki: HashMap, - container_registry: RegistrySettings, - oci_defaults: OciDefaults, - oci_hooks: OciHooks, - dns: DnsSettings, - container_runtime: ContainerRuntimeSettings, -} diff --git a/variants/Cargo.lock b/variants/Cargo.lock index 3f995575b53..b97666065ff 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -69,33 +69,6 @@ dependencies = [ "glibc", ] -[[package]] -name = "aws-k8s-1_22" -version = "0.1.0" -dependencies = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-5_10", - "kubernetes-1_22", - "release", -] - -[[package]] -name = "aws-k8s-1_22-nvidia" -version = "0.1.0" -dependencies = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-5_10", - "kmod-5_10-nvidia", - "kubernetes-1_22", - "nvidia-container-toolkit", - "nvidia-k8s-device-plugin", - "release", -] - [[package]] name = "aws-k8s-1_23" version = "0.1.0" @@ -528,15 +501,6 @@ dependencies = [ "kernel-5_15", ] -[[package]] -name = "kubernetes-1_22" -version = "0.1.0" -dependencies = [ - "aws-signing-helper", - "ecr-credential-provider", - "glibc", -] - [[package]] name = "kubernetes-1_23" version = "0.1.0" @@ -881,17 +845,6 @@ dependencies = [ "tcpdump", ] -[[package]] -name = "metal-k8s-1_22" -version = "0.1.0" -dependencies = [ - "cni", - "cni-plugins", - "kernel-5_10", - "kubernetes-1_22", - "release", -] - [[package]] name = "metal-k8s-1_23" version = "0.1.0" @@ -1135,18 +1088,6 @@ dependencies = [ "tcpdump", ] -[[package]] -name = "vmware-k8s-1_22" -version = "0.1.0" -dependencies = [ - "cni", - "cni-plugins", - "kernel-5_10", - "kubernetes-1_22", - "open-vm-tools", - "release", -] - [[package]] name = "vmware-k8s-1_23" version = "0.1.0" diff --git a/variants/Cargo.toml b/variants/Cargo.toml index bbdf890c835..657452d9c94 100644 --- a/variants/Cargo.toml +++ b/variants/Cargo.toml @@ -3,8 +3,6 @@ members = [ "aws-dev", "aws-ecs-1", "aws-ecs-1-nvidia", - "aws-k8s-1.22", - "aws-k8s-1.22-nvidia", "aws-k8s-1.23", "aws-k8s-1.23-nvidia", "aws-k8s-1.24", @@ -16,14 +14,12 @@ members = [ "aws-k8s-1.27", "aws-k8s-1.27-nvidia", "metal-dev", - "metal-k8s-1.22", "metal-k8s-1.23", "metal-k8s-1.24", "metal-k8s-1.25", "metal-k8s-1.26", "metal-k8s-1.27", "vmware-dev", - "vmware-k8s-1.22", "vmware-k8s-1.23", "vmware-k8s-1.24", "vmware-k8s-1.25", diff --git a/variants/README.md b/variants/README.md index 762934bd990..9ea3ec4241d 100644 --- a/variants/README.md +++ b/variants/README.md @@ -33,20 +33,6 @@ For example, in a VMware variant, settings read from the guestinfo interface wil ## Variants -### aws-k8s-1.22: Kubernetes 1.22 node - -The [aws-k8s-1.22](aws-k8s-1.22/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.22, 1.23, and 1.24 clusters. - -### aws-k8s-1.22-nvidia: Kubernetes 1.22 NVIDIA node - -The [aws-k8s-1.22-nvidia](aws-k8s-1.22-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.22, 1.23, and 1.24 clusters. - ### aws-k8s-1.23: Kubernetes 1.23 node The [aws-k8s-1.23](aws-k8s-1.23/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. @@ -139,13 +125,6 @@ User data will be read from IMDS. The [vmware-dev](vmware-dev/Cargo.toml) variant has useful packages for local development of the OS, and is intended to run as a VMware guest. It includes tools for troubleshooting as well as Docker for running containers. -### vmware-k8s-1.22: VMware Kubernetes 1.22 node - -The [vmware-k8s-1.22](vmware-k8s-1.22/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.22, 1.23, and 1.24 clusters. - ### vmware-k8s-1.23: VMware Kubernetes 1.23 node The [vmware-k8s-1.23](vmware-k8s-1.23/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. @@ -186,13 +165,6 @@ This variant is compatible with Kubernetes 1.27, 1.28, and 1.29 clusters. The [metal-dev](metal-dev/Cargo.toml) variant has useful packages for local development of the OS and is intended to run bare metal. It includes tools for troubleshooting as well as Docker for running containers. -### metal-k8s-1.22: Metal Kubernetes 1.22 node - -The [metal-k8s-1.22](metal-k8s-1.22/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.22, 1.23, and 1.24 clusters. - ### metal-k8s-1.23: Metal Kubernetes 1.23 node The [metal-k8s-1.23](metal-k8s-1.23/Cargo.toml) variant includes the packages needed to run a Kubernetes node on bare metal. @@ -325,6 +297,35 @@ It supported self-hosted clusters. This variant was compatible with Kubernetes 1.21, 1.22, and 1.23 clusters. +### aws-k8s-1.22: Kubernetes 1.22 node + +The aws-k8s-1.22 variant included the packages needed to run a Kubernetes node in AWS. +It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant was compatible with Kubernetes 1.22, 1.23, and 1.24 clusters. + +### aws-k8s-1.22-nvidia: Kubernetes 1.22 NVIDIA node + +The aws-k8s-1.22-nvidia variant included the packages needed to run a Kubernetes node in AWS. +It also included the required packages to configure containers to leverage NVIDIA GPUs. +It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant was compatible with Kubernetes 1.22, 1.23, and 1.24 clusters. + +### metal-k8s-1.22: Metal Kubernetes 1.22 node + +The metal-k8s-1.22 variant included the packages needed to run a Kubernetes node on bare metal. +It supported self-hosted clusters. + +This variant was compatible with Kubernetes 1.22, 1.23, and 1.24 clusters. + +### vmware-k8s-1.22: VMware Kubernetes 1.22 node + +The vmware-k8s-1.22 variant included the packages needed to run a Kubernetes worker node as a VMware guest. +It supported self-hosted clusters. + +This variant was compatible with Kubernetes 1.22, 1.23, and 1.24 clusters. + ## Development Say we want to create `my-variant`, a custom build of Bottlerocket that runs `my-agent`. diff --git a/variants/aws-k8s-1.22-nvidia/Cargo.toml b/variants/aws-k8s-1.22-nvidia/Cargo.toml deleted file mode 100644 index 878f29dad94..00000000000 --- a/variants/aws-k8s-1.22-nvidia/Cargo.toml +++ /dev/null @@ -1,47 +0,0 @@ -[package] -# This is the aws-k8s-1.22-nvidia variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_22-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] -included-packages = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-5.10", - "kubelet-1.22", - "release", - "nvidia-container-toolkit", - "nvidia-k8s-device-plugin", - "kmod-5.10-nvidia-tesla-470", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] - -[lib] -path = "lib.rs" - -[build-dependencies] -aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" } -cni = { path = "../../packages/cni" } -cni-plugins = { path = "../../packages/cni-plugins" } -kernel-5_10 = { path = "../../packages/kernel-5.10" } -kubernetes-1_22 = { path = "../../packages/kubernetes-1.22" } -release = { path = "../../packages/release" } -nvidia-container-toolkit = { path = "../../packages/nvidia-container-toolkit" } -nvidia-k8s-device-plugin = { path = "../../packages/nvidia-k8s-device-plugin" } -kmod-5_10-nvidia = { path = "../../packages/kmod-5.10-nvidia" } diff --git a/variants/aws-k8s-1.22-nvidia/build.rs b/variants/aws-k8s-1.22-nvidia/build.rs deleted file mode 100644 index d6a90e4df44..00000000000 --- a/variants/aws-k8s-1.22-nvidia/build.rs +++ /dev/null @@ -1,9 +0,0 @@ -use std::process::{exit, Command}; - -fn main() -> Result<(), std::io::Error> { - let ret = Command::new("buildsys").arg("build-variant").status()?; - if !ret.success() { - exit(1); - } - Ok(()) -} diff --git a/variants/aws-k8s-1.22-nvidia/lib.rs b/variants/aws-k8s-1.22-nvidia/lib.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/variants/aws-k8s-1.22-nvidia/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/variants/aws-k8s-1.22/Cargo.toml b/variants/aws-k8s-1.22/Cargo.toml deleted file mode 100644 index c4ddd4b0bf1..00000000000 --- a/variants/aws-k8s-1.22/Cargo.toml +++ /dev/null @@ -1,38 +0,0 @@ -[package] -# This is the aws-k8s-1.22 variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_22" -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] -included-packages = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-5.10", - "kubelet-1.22", - "release", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "quiet", -] - -[lib] -path = "lib.rs" - -[build-dependencies] -aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" } -cni = { path = "../../packages/cni" } -cni-plugins = { path = "../../packages/cni-plugins" } -kernel-5_10 = { path = "../../packages/kernel-5.10" } -kubernetes-1_22 = { path = "../../packages/kubernetes-1.22" } -release = { path = "../../packages/release" } diff --git a/variants/aws-k8s-1.22/build.rs b/variants/aws-k8s-1.22/build.rs deleted file mode 100644 index d6a90e4df44..00000000000 --- a/variants/aws-k8s-1.22/build.rs +++ /dev/null @@ -1,9 +0,0 @@ -use std::process::{exit, Command}; - -fn main() -> Result<(), std::io::Error> { - let ret = Command::new("buildsys").arg("build-variant").status()?; - if !ret.success() { - exit(1); - } - Ok(()) -} diff --git a/variants/aws-k8s-1.22/lib.rs b/variants/aws-k8s-1.22/lib.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/variants/aws-k8s-1.22/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/variants/metal-k8s-1.22/Cargo.toml b/variants/metal-k8s-1.22/Cargo.toml deleted file mode 100644 index b45d340e13b..00000000000 --- a/variants/metal-k8s-1.22/Cargo.toml +++ /dev/null @@ -1,42 +0,0 @@ -[package] -# This is the metal-k8s-1.22 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "metal-k8s-1_22" -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 - -[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 = [ - "cni", - "cni-plugins", - "kernel-5.10", - "kubelet-1.22", - "release", -] - -[lib] -path = "lib.rs" - -[build-dependencies] -cni = { path = "../../packages/cni" } -cni-plugins = { path = "../../packages/cni-plugins" } -kernel-5_10 = { path = "../../packages/kernel-5.10" } -kubernetes-1_22 = { path = "../../packages/kubernetes-1.22" } -release = { path = "../../packages/release" } diff --git a/variants/metal-k8s-1.22/build.rs b/variants/metal-k8s-1.22/build.rs deleted file mode 100644 index d6a90e4df44..00000000000 --- a/variants/metal-k8s-1.22/build.rs +++ /dev/null @@ -1,9 +0,0 @@ -use std::process::{exit, Command}; - -fn main() -> Result<(), std::io::Error> { - let ret = Command::new("buildsys").arg("build-variant").status()?; - if !ret.success() { - exit(1); - } - Ok(()) -} diff --git a/variants/metal-k8s-1.22/lib.rs b/variants/metal-k8s-1.22/lib.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/variants/metal-k8s-1.22/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/variants/vmware-k8s-1.22/Cargo.toml b/variants/vmware-k8s-1.22/Cargo.toml deleted file mode 100644 index 1dbc032e3d6..00000000000 --- a/variants/vmware-k8s-1.22/Cargo.toml +++ /dev/null @@ -1,44 +0,0 @@ -[package] -# This is the vmware-k8s-1.22 variant. "." is not allowed in crate names, but -# we don't use this crate name anywhere. -name = "vmware-k8s-1_22" -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-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 = [ - "cni", - "cni-plugins", - "kernel-5.10", - "kubelet-1.22", - "open-vm-tools", - "release", -] - -[lib] -path = "lib.rs" - -[build-dependencies] -cni = { path = "../../packages/cni" } -cni-plugins = { path = "../../packages/cni-plugins" } -kernel-5_10 = { path = "../../packages/kernel-5.10" } -kubernetes-1_22 = { path = "../../packages/kubernetes-1.22" } -open-vm-tools = { path = "../../packages/open-vm-tools" } -release = { path = "../../packages/release" } diff --git a/variants/vmware-k8s-1.22/build.rs b/variants/vmware-k8s-1.22/build.rs deleted file mode 100644 index d6a90e4df44..00000000000 --- a/variants/vmware-k8s-1.22/build.rs +++ /dev/null @@ -1,9 +0,0 @@ -use std::process::{exit, Command}; - -fn main() -> Result<(), std::io::Error> { - let ret = Command::new("buildsys").arg("build-variant").status()?; - if !ret.success() { - exit(1); - } - Ok(()) -} diff --git a/variants/vmware-k8s-1.22/lib.rs b/variants/vmware-k8s-1.22/lib.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/variants/vmware-k8s-1.22/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// not used diff --git a/variants/vmware-k8s-1.22/template.ovf b/variants/vmware-k8s-1.22/template.ovf deleted file mode 120000 index e301e3bb05d..00000000000 --- a/variants/vmware-k8s-1.22/template.ovf +++ /dev/null @@ -1 +0,0 @@ -../shared/template-unified.ovf \ No newline at end of file