Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AKS] Implement --enable-oidc-issuer #4280

Merged
merged 9 commits into from
Jan 4, 2022
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/aks-preview/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Release History
===============
0.5.50
++++++
* Add support for enabling OIDC issuer with `--enable-oidc-issuer` flag.

0.5.49
++++++
* Add support for Alias Minor Version.
Expand Down
6 changes: 6 additions & 0 deletions src/aks-preview/azext_aks_preview/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@
- name: --snapshot-id
type: string
short-summary: The source snapshot id used to create this cluster.
- name: --enable-oidc-issuer
type: bool
short-summary: (PREVIEW) Enable OIDC issuer.
examples:
- name: Create a Kubernetes cluster with an existing SSH public key.
text: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
Expand Down Expand Up @@ -652,6 +655,9 @@
long-summary: |-
You do not need to set this if you have set DNS server in the VNET used by the cluster.
You must set or not set --gmsa-dns-server and --gmsa-root-domain-name at the same time when setting --enable-windows-gmsa.
- name: --enable-oidc-issuer
type: bool
short-summary: (PREVIEW) Enable OIDC issuer.
examples:
- name: Enable cluster-autoscaler within node count range [1,5]
text: az aks update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n MyManagedCluster
Expand Down
2 changes: 2 additions & 0 deletions src/aks-preview/azext_aks_preview/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def load_arguments(self, _):
c.argument('yes', options_list=['--yes', '-y'], help='Do not prompt for confirmation.', action='store_true')
c.argument('workload_runtime', arg_type=get_enum_type(workload_runtimes), default=CONST_WORKLOAD_RUNTIME_OCI_CONTAINER)
c.argument('snapshot_id', type=str, validator=validate_snapshot_id, is_preview=True)
c.argument('enable_oidc_issuer', action='store_true', is_preview=True)

with self.argument_context('aks update') as c:
c.argument('enable_cluster_autoscaler', options_list=["--enable-cluster-autoscaler", "-e"], action='store_true')
Expand Down Expand Up @@ -200,6 +201,7 @@ def load_arguments(self, _):
c.argument('gmsa_root_domain_name', options_list=['--gmsa-root-domain-name'])
c.argument('yes', options_list=['--yes', '-y'], help='Do not prompt for confirmation.', action='store_true')
c.argument('nodepool_labels', nargs='*', validator=validate_nodepool_labels, help='space-separated labels: key[=value] [key[=value] ...]. See https://aka.ms/node-labels for syntax of labels.')
c.argument('enable_oidc_issuer', action='store_true', is_preview=True)

with self.argument_context('aks scale') as c:
c.argument('nodepool_name', type=str,
Expand Down
4 changes: 3 additions & 1 deletion src/aks-preview/azext_aks_preview/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,7 @@ def aks_create(cmd,
gmsa_dns_server=None,
gmsa_root_domain_name=None,
snapshot_id=None,
enable_oidc_issuer=False,
yes=False):
# DO NOT MOVE: get all the original parameters and save them as a dictionary
raw_parameters = locals()
Expand Down Expand Up @@ -833,7 +834,8 @@ def aks_update(cmd, # pylint: disable=too-many-statements,too-many-branches,
disable_azure_rbac=False,
enable_windows_gmsa=False,
gmsa_dns_server=None,
gmsa_root_domain_name=None):
gmsa_root_domain_name=None,
enable_oidc_issuer=False):
# DO NOT MOVE: get all the original parameters and save them as a dictionary
raw_parameters = locals()

Expand Down
49 changes: 48 additions & 1 deletion src/aks-preview/azext_aks_preview/decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
ManagedClusterHTTPProxyConfig = TypeVar("ManagedClusterHTTPProxyConfig")
ContainerServiceNetworkProfile = TypeVar("ContainerServiceNetworkProfile")
ManagedClusterAddonProfile = TypeVar("ManagedClusterAddonProfile")
ManagedClusterOIDCIssuerProfile = TypeVar('ManagedClusterOIDCIssuerProfile')
Snapshot = TypeVar("Snapshot")


Expand Down Expand Up @@ -114,6 +115,11 @@ def __init__(self, cmd: AzCommandsLoader, resource_type: ResourceType):
self.init_nat_gateway_models()
# holder for pod identity related models
self.__pod_identity_models = None
self.ManagedClusterOIDCIssuerProfile = self.__cmd.get_models(
"ManagedClusterOIDCIssuerProfile",
resource_type=self.resource_type,
operation_group="managed_clusters",
)

# TODO: convert this to @property
def init_nat_gateway_models(self) -> None:
Expand Down Expand Up @@ -1492,6 +1498,24 @@ def get_node_vm_size(self) -> str:
"""
return self._get_node_vm_size()

def get_oidc_issuer_profile(self) -> ManagedClusterOIDCIssuerProfile:
"""Obtain the value of oidc_issuer_profile based on the user input.

:return: ManagedClusterOIDCIssuerProfile
"""
enable_flag_value = bool(self.raw_param.get("enable_oidc_issuer"))
if not enable_flag_value:
# enable flag not set, return a None profile, server side will backfill the default/existing value
return None

profile = self.models.ManagedClusterOIDCIssuerProfile()
if self.decorator_mode == DecoratorMode.UPDATE:
if self.mc.oidc_issuer_profile is not None:
profile = self.mc.oidc_issuer_profile
profile.enabled = True

return profile


class AKSPreviewCreateDecorator(AKSCreateDecorator):
# pylint: disable=super-init-not-called
Expand Down Expand Up @@ -1799,6 +1823,15 @@ def set_up_windows_profile(self, mc: ManagedCluster) -> ManagedCluster:
mc.windows_profile = windows_profile
return mc

def set_up_oidc_issuer_profile(self, mc: ManagedCluster) -> ManagedCluster:
"""Set up OIDC issuer profile for the ManagedCluster object.

:return: the ManagedCluster object
"""
mc.oidc_issuer_profile = self.context.get_oidc_issuer_profile()

return mc

def construct_mc_preview_profile(self) -> ManagedCluster:
"""The overall controller used to construct the preview ManagedCluster profile.

Expand All @@ -1817,6 +1850,7 @@ def construct_mc_preview_profile(self) -> ManagedCluster:
mc = self.set_up_pod_security_policy(mc)
# set up pod identity profile
mc = self.set_up_pod_identity_profile(mc)
mc = self.set_up_oidc_issuer_profile(mc)
return mc

def create_mc_preview(self, mc: ManagedCluster) -> ManagedCluster:
Expand Down Expand Up @@ -1963,7 +1997,8 @@ def check_raw_parameters(self):
'"--enable-public-fqdn" or '
'"--disable-public-fqdn"'
'"--enble-windows-gmsa" or '
'"--nodepool-labels".'
'"--nodepool-labels" or '
'"--enable-oidc-issuer".'
)

def update_load_balancer_profile(self, mc: ManagedCluster) -> ManagedCluster:
Expand Down Expand Up @@ -2078,6 +2113,17 @@ def update_pod_identity_profile(self, mc: ManagedCluster) -> ManagedCluster:
_update_addon_pod_identity(mc, enable=False, models=self.models.pod_identity_models)
return mc

def update_oidc_issuer_profile(self, mc: ManagedCluster) -> ManagedCluster:
"""Update OIDC issuer profile for the ManagedCluster object.

:return: the ManagedCluster object
"""
self._ensure_mc(mc)

mc.oidc_issuer_profile = self.context.get_oidc_issuer_profile()

return mc

def patch_mc(self, mc: ManagedCluster) -> ManagedCluster:
"""Helper function to patch the ManagedCluster object.

Expand Down Expand Up @@ -2109,6 +2155,7 @@ def update_mc_preview_profile(self) -> ManagedCluster:
mc = self.update_nat_gateway_profile(mc)
# update pod identity profile
mc = self.update_pod_identity_profile(mc)
mc = self.update_oidc_issuer_profile(mc)
return mc

def update_mc_preview(self, mc: ManagedCluster) -> ManagedCluster:
Expand Down
Loading