From a19f592010001584f8fa9692203852b158d70f0d Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Wed, 31 Jan 2024 11:56:01 -0800 Subject: [PATCH] Drop Ephemeral Container feature gate --- README.md | 2 -- defaults.env | 1 - k8s-cluster.tpl | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index d9854325..79c0228e 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,6 @@ instruction shows how to upgrade the existing Kubernetes cluster to | KRD_NDOTS | 1 | Threshold for the number of dots which must appear in name resolution | | KRD_RESOLVCONF_MODE | none | Specifies the DNS setup for non-k8s containers. | | KRD_KUBE_PROXY_SCHEDULER | sh | Specifies the [IPVS scheduling algorithm][7] for allocating connections | -| KRD_EPHEMERAL_CONTAINERS_ENABLED | true | Enable/Disable [Ephemeral Containers][21] | | KRD_METALLB_ENABLED | false | Enable/Disable [MetalLB load-balancer][22] | | KRD_METALLB_ADDRESS_POOLS_LIST | | Specifies a lists of Layer 2 Address pools for MetalLB | | KRD_KUBERNETES_AUDIT | false | Enable/Disable [Auditing][23] | @@ -215,7 +214,6 @@ Thanks to all the people who already contributed! [18]: https://github.com/containers/crun [19]: https://metallb.universe.tf/ [20]: https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner -[21]: https://kubernetes.io/docs/concepts/workloads/pods/ephemeral-containers/ [22]: https://metallb.universe.tf/ [23]: https://kubernetes.io/docs/tasks/debug-application-cluster/audit/ [24]: https://kubernetes.io/docs/concepts/cluster-administration/logging/ diff --git a/defaults.env b/defaults.env index 3475723b..82dc1401 100644 --- a/defaults.env +++ b/defaults.env @@ -47,7 +47,6 @@ export KRD_ENABLE_NODELOCALDNS=${KRD_ENABLE_NODELOCALDNS:-true} export KRD_NDOTS=${KRD_NDOTS:-1} export KRD_RESOLVCONF_MODE=${KRD_RESOLVCONF_MODE:-none} export KRD_KUBE_PROXY_SCHEDULER=${KRD_KUBE_PROXY_SCHEDULER:-sh} -export KRD_EPHEMERAL_CONTAINERS_ENABLED=${KRD_EPHEMERAL_CONTAINERS_ENABLED:-true} export KRD_METALLB_ENABLED=${KRD_METALLB_ENABLED:-false} export KRD_METALLB_ADDRESS_POOLS_LIST=${KRD_METALLB_ADDRESS_POOLS_LIST:-10.10.16.110-10.10.16.120,10.10.16.240-10.10.16.250} export KRD_KUBERNETES_AUDIT=${KRD_KUBERNETES_AUDIT:-false} diff --git a/k8s-cluster.tpl b/k8s-cluster.tpl index 896e8c1a..6fc9fde2 100644 --- a/k8s-cluster.tpl +++ b/k8s-cluster.tpl @@ -153,8 +153,7 @@ resolvconf_mode: $KRD_RESOLVCONF_MODE # nq: Never Queue assigns an incoming job to an idle server if there is, instead of waiting for a fast one; if all the servers are busy, it adopts the Shortest Expected Delay policy to assign the job. kube_proxy_scheduler: $KRD_KUBE_PROXY_SCHEDULER -kube_feature_gates: - - EphemeralContainers=$KRD_EPHEMERAL_CONTAINERS_ENABLED # Ability to add ephemeral containers to running pods. +kube_feature_gates: [] # configure arp_ignore and arp_announce to avoid answering ARP queries from kube-ipvs0 interface # must be set to true for MetalLB to work