openstack
/
python-magnumclient
Code Issues Proposed changes

Update client.authentication.k8s.io api version for kubeconfig 

The v1alpha1 version is removed in kubernetes 1.24. v1beta1 was added in
Kubernetes 1.11 and should be supported through existing versions.

Change-Id: I446b8c1c9b46fb8d70317f271a6a650d2a1bbefa
This commit is contained in:
Travis Holton 2022-11-28 08:40:59 +13:00 committed by Jake Yip
parent 4d74c31c9a
commit de11f40d0c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnumclient/common/utils.py
View File

@ -238,7 +238,7 @@ def _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
" user:\n"
" exec:\n"
" command: /bin/bash\n"
" apiVersion: client.authentication.k8s.io/v1alpha1\n"
" apiVersion: client.authentication.k8s.io/v1beta1\n"
" args:\n"
" - -c\n"
" - >\n"
@ -246,7 +246,7 @@ def _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
" echo 'Error: Missing OpenStack credential from environment variable $OS_TOKEN' > /dev/stderr\n" # noqa
" exit 1\n"
" else\n"
" echo '{ \"apiVersion\": \"client.authentication.k8s.io/v1alpha1\", \"kind\": \"ExecCredential\", \"status\": { \"token\": \"'\"${OS_TOKEN}\"'\"}}'\n" # noqa
" echo '{ \"apiVersion\": \"client.authentication.k8s.io/v1beta1\", \"kind\": \"ExecCredential\", \"status\": { \"token\": \"'\"${OS_TOKEN}\"'\"}}'\n" # noqa
" fi\n"
% {'name': cluster.name,
'api_address': cluster.api_address,