diff --git a/docs/networking/ipv6.md b/docs/networking/ipv6.md index 9d2fda67bc..d2cba45276 100644 --- a/docs/networking/ipv6.md +++ b/docs/networking/ipv6.md @@ -1,8 +1,8 @@ # IPv6 -{{ kops_feature_table(kops_added_ff='1.23') }} +{{ kops_feature_table(kops_added_ff='1.23', kops_added_beta='1.26') }} -kOps has experimental support for configuring clusters with IPv6-only pods and IPv6-only or dual-stack nodes. +kOps has beta support for configuring clusters with IPv6-only pods and IPv6-only or dual-stack nodes. IPv6 mode is specified by setting `nonMasqueradeCIDR: "::/0"` in the cluster spec. The `--ipv6` flag of `kops create cluster` sets this field, among others. diff --git a/docs/releases/1.26-NOTES.md b/docs/releases/1.26-NOTES.md index edd0062f9e..e4b1592c6c 100644 --- a/docs/releases/1.26-NOTES.md +++ b/docs/releases/1.26-NOTES.md @@ -21,7 +21,7 @@ with "control-plane-". The names of groups for existing clusters are unchanged. * As of Kubernetes version 1.26 and with IRSA enabled, control plane nodes will now run with a max hop limit of 1 for the metadata service. This will prevent Pods without host networking from accessing the instance metadata service. -* New IPv6 clusters now default to using private topology. +* IPv6 is now beta. New IPv6 clusters now default to using private topology. * CapacityRebalance can be enabled/disabled on ASGs through a new `capacityRebalance` field in InstanceGroup specs. diff --git a/hack/mkdocs_macros/feature_stability_table.py b/hack/mkdocs_macros/feature_stability_table.py index 546ecdf943..3eb5750eb8 100644 --- a/hack/mkdocs_macros/feature_stability_table.py +++ b/hack/mkdocs_macros/feature_stability_table.py @@ -24,6 +24,7 @@ def define_env(env): Generate a markdown table which will be rendered when called, along with the supported passed keyword args. :param kwargs: kops_added_ff => kOps version in which this feature was added as a feature flag + kops_added_beta => kOps version in which this feature was introduced as beta kops_added_default => kOps version in which this feature was introduced as stable k8s_min => Minimum k8s version which supports this feature :return: rendered markdown table @@ -32,6 +33,7 @@ def define_env(env): # this dict object maps the kwarg to its description, which will be used in the final table supported_args = { 'kops_added_ff': 'Alpha (Feature Flag)', + 'kops_added_beta': 'Beta', 'kops_added_default': 'Default', 'k8s_min': 'Minimum K8s Version' } @@ -45,7 +47,7 @@ def define_env(env): for arg, header in supported_args.items(): if arg not in kwargs.keys(): continue - if arg == 'kops_added_default' and 'kops_added_ff' not in kwargs.keys(): + if arg == 'kops_added_default' and 'kops_added_ff' not in kwargs.keys() and 'kops_added_beta' not in kwargs.keys(): title += ' Introduced |' else: title += f' {header} |'