[k8s-configuration] Release v1.2.0 with Flux v2 Support

src/k8s-configuration/HISTORY.rst

@@ -3,6 +3,11 @@
 Release History
 ===============
 
+1.2.0
+++++++++++++++++++
+* Add Flux v2 support with command subgroups
+* Add update support to Flux v2 resources
+
 1.1.1
 ++++++++++++++++++
 * Enable helm-operator chart version 1.4.0

src/k8s-configuration/README.rst

@@ -11,11 +11,57 @@ az extension add --name k8s-configuration
 ```
 
 ### Included Features
-#### Kubernetes Configuration:
-Kubernetes SourceControl Configuration: [more info](https://docs.microsoft.com/en-us/azure/kubernetessconfiguration/)\
+
+#### Flux Configuration (Flux v2):
+Flux Configuration (Flux v1) Configuration: [more info](https://docs.microsoft.com/en-us/azure/kubernetessconfiguration/)\
+*Examples:*
+
+##### Create a Flux Configuration (Flux v2)
+```
+az k8s-configuration create flux \
+    --resource-group groupName \
+    --cluster-name clusterName \
+    --cluster-type clusterType \
+    --name configurationName \
+    --namespace configurationNamespace \
+    --scope cluster
+    --kind git \
+    --url https://github.com/Azure/arc-k8s-demo \
+    --branch main \
+    --kustomization name=my-kustomization 
+```
+
+##### Get a Flux Configuration (Flux v2)
+```
+az k8s-configuration flux show \
+    --resource-group groupName \
+    --cluster-name clusterName \
+    --cluster-type clusterType \
+    --name configurationName
+```
+
+##### Delete a Flux Configuration (Flux v2)
+```
+az k8s-configuration flux delete \
+    --resource-group groupName \
+    --cluster-name clusterName \
+    --cluster-type clusterType \
+    --name configurationName
+```
+
+##### List all Flux Configuration (Flux v2) on a cluster
+```
+az k8s-configuration flux list \
+    --resource-group groupName \
+    --cluster-name clusterName \
+    --cluster-type clusterType
+```
+
+#### Source Control Configuration (Flux v1):
+Source Control Configuration (Flux v1) Configuration: [more info](https://docs.microsoft.com/en-us/azure/kubernetessconfiguration/)\
 *Examples:*
 
-##### Create a KubernetesConfiguration
+##### Create a Source Control Configuration (Flux v1)
 ```
 az k8s-configuration create \
     --resource-group groupName \
@@ -31,7 +77,7 @@ az k8s-configuration create \
     --helm-operator-params chartParameters
 ```
 
-##### Get a KubernetesConfiguration
+##### Get a Source Control Configuration (Flux v1)
 ```
 az k8s-configuration show \
     --resource-group groupName \
@@ -40,7 +86,7 @@ az k8s-configuration show \
     --name configurationName
 ```
 
-##### Delete a KubernetesConfiguration
+##### Delete a Source Control Configuration (Flux v1)
 ```
 az k8s-configuration delete \
     --resource-group groupName \
@@ -49,7 +95,7 @@ az k8s-configuration delete \
     --name configurationName
 ```
 
-##### Update a KubernetesConfiguration
+##### Update a Source Control Configuration (Flux v1)
 ```
 az k8s-configuration create \
     --resource-group groupName \
@@ -63,7 +109,7 @@ az k8s-configuration create \
     --helm-operator-params chartParameters
 ```
 
-##### List all KubernetesConfigurations of a cluster
+##### List all Source Control Configuration (Flux v1) on a cluster
 ```
 az k8s-configuration list \
     --resource-group groupName \

src/k8s-configuration/azext_k8s_configuration/__init__.py

@@ -12,12 +12,12 @@ class K8sConfigurationCommandsLoader(AzCommandsLoader):
 
     def __init__(self, cli_ctx=None):
         from azure.cli.core.commands import CliCommandType
-        from azext_k8s_configuration._client_factory import cf_k8s_configuration
+        from azext_k8s_configuration._client_factory import k8s_configuration_client
         k8s_configuration_custom = CliCommandType(
             operations_tmpl='azext_k8s_configuration.custom#{}',
-            client_factory=cf_k8s_configuration)
-        super(K8sConfigurationCommandsLoader, self).__init__(cli_ctx=cli_ctx,
-                                                             custom_command_type=k8s_configuration_custom)
+            client_factory=k8s_configuration_client)
+        super().__init__(cli_ctx=cli_ctx,
+                         custom_command_type=k8s_configuration_custom)
 
     def load_command_table(self, args):
         from azext_k8s_configuration.commands import load_command_table

src/k8s-configuration/azext_k8s_configuration/_client_factory.py

@@ -4,17 +4,45 @@
 # --------------------------------------------------------------------------------------------
 
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
+from azure.cli.core.profiles import ResourceType
+from . import consts
 
 
-def cf_k8s_configuration(cli_ctx, *_):
+def k8s_configuration_client(cli_ctx, **kwargs):
     from azext_k8s_configuration.vendored_sdks import SourceControlConfigurationClient
-    return get_mgmt_service_client(cli_ctx, SourceControlConfigurationClient)
+    return get_mgmt_service_client(cli_ctx, SourceControlConfigurationClient, **kwargs)
 
 
-def cf_k8s_configuration_operation(cli_ctx, _):
-    return cf_k8s_configuration(cli_ctx).source_control_configurations
+def k8s_configuration_fluxconfig_client(cli_ctx, *_):
+    return k8s_configuration_client(cli_ctx, api_version=consts.FLUXCONFIG_API_VERSION).flux_configurations
 
 
-def _resource_providers_client(cli_ctx):
+def k8s_configuration_sourcecontrol_client(cli_ctx, *_):
+    return k8s_configuration_client(
+        cli_ctx,
+        api_version=consts.SOURCE_CONTROL_API_VERSION
+    ).source_control_configurations
+
+
+def k8s_configuration_extension_client(cli_ctx, *_):
+    return k8s_configuration_client(cli_ctx, api_version=consts.EXTENSION_API_VERSION).extensions
+
+
+def resource_providers_client(cli_ctx):
     from azure.mgmt.resource import ResourceManagementClient
     return get_mgmt_service_client(cli_ctx, ResourceManagementClient).providers
+
+
+def cf_resource_groups(cli_ctx, subscription_id=None):
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,
+                                   subscription_id=subscription_id).resource_groups
+
+
+def cf_resources(cli_ctx, subscription_id=None):
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,
+                                   subscription_id=subscription_id).resources
+
+
+def cf_log_analytics(cli_ctx, subscription_id=None):
+    from azure.mgmt.loganalytics import LogAnalyticsManagementClient  # pylint: disable=no-name-in-module
+    return get_mgmt_service_client(cli_ctx, LogAnalyticsManagementClient, subscription_id=subscription_id)

src/k8s-configuration/azext_k8s_configuration/_help.py

@@ -6,17 +6,16 @@
 
 from knack.help_files import helps  # pylint: disable=unused-import
 
-
 helps['k8s-configuration'] = """
     type: group
-    short-summary: Commands to manage Kubernetes configuration.
+    short-summary: Commands to manage resources from Microsoft.KubernetesConfiguration.
 """
 
 helps['k8s-configuration create'] = """
     type: command
-    short-summary: Create a Kubernetes configuration.
+    short-summary: Create a Flux v1 Kubernetes configuration (This command is for Flux v1, to use the newer Flux v2, run "az k8s-configuration flux create").
     examples:
-      - name: Create a Kubernetes configuration
+      - name: Create a Flux v1 Kubernetes configuration
         text: |-
             az k8s-configuration create --resource-group MyResourceGroup --cluster-name MyClusterName \\
             --cluster-type connectedClusters --name MyGitConfig --operator-instance-name OperatorInst01 \\
@@ -29,42 +28,149 @@
 
 helps['k8s-configuration list'] = """
     type: command
-    short-summary: List Kubernetes configurations.
+    short-summary: List Flux v1 Kubernetes configurations (This command is for Flux v1, to use the newer Flux v2, run "az k8s-configuration flux list").
     examples:
-      - name: List all Kubernetes configurations of a cluster
+      - name: List Flux v1 Kubernetes configuration
         text: |-
             az k8s-configuration list --resource-group MyResourceGroup --cluster-name MyClusterName \\
             --cluster-type connectedClusters
 """
 
 helps['k8s-configuration delete'] = """
     type: command
-    short-summary: Delete a Kubernetes configuration.
+    short-summary: Delete a Flux v1 Kubernetes configuration (This command is for Flux v1, to use the newer Flux v2, run "az k8s-configuration flux delete").
     examples:
-      - name: Delete a Kubernetes configuration
+      - name: Delete a Flux v1 Kubernetes configuration
         text: |-
             az k8s-configuration delete --resource-group MyResourceGroup --cluster-name MyClusterName \\
             --cluster-type connectedClusters --name MyConfigurationName
 """
 
 helps['k8s-configuration show'] = """
     type: command
-    short-summary: Show details of a Kubernetes configuration.
+    short-summary: Show details of a Flux v1 Kubernetes configuration (This command is for Flux v1, to use the newer Flux v2, run "az k8s-configuration flux show").
     examples:
-      - name: Show a Kubernetes configuration
+      - name: Show details of a Flux v1 Kubernetes configuration
         text: |-
             az k8s-configuration show --resource-group MyResourceGroup --cluster-name MyClusterName \\
             --cluster-type connectedClusters --name MyConfigurationName
 """
 
-helps['k8s-configuration update'] = """
+helps['k8s-configuration flux'] = """
+    type: group
+    short-summary: Commands to manage Flux v2 Kubernetes configurations.
+"""
+
+helps['k8s-configuration flux create'] = """
+    type: command
+    short-summary: Create a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: Create a Kubernetes v2 Flux Configuration
+        text: |-
+          az k8s-configuration flux create --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters \\
+          --name myconfig --scope cluster --namespace my-namespace \\
+          --kind git --url https://github.com/Azure/arc-k8s-demo \\
+          --branch main --kustomization name=my-kustomization
+"""
+
+helps['k8s-configuration flux update'] = """
+    type: command
+    short-summary: Update a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: Update a Kubernetes v2 Flux Configuration
+        text: |-
+          az k8s-configuration flux update --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig \\
+          --url https://github.com/Azure/arc-k8s-demo --branch main \\
+          --kustomization name=my-kustomization path=./my/new-path
+"""
+
+helps['k8s-configuration flux list'] = """
+    type: command
+    short-summary: List Kubernetes Flux v2 Configurations.
+    examples:
+      - name: List all Kubernetes Flux v2 Configurations on a cluster
+        text: |-
+          az k8s-configuration flux list --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters
+"""
+
+helps['k8s-configuration flux show'] = """
+    type: command
+    short-summary: Show a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: Show details of a Kubernetes Flux v2 Configuration
+        text: |-
+          az k8s-configuration flux show --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig
+"""
+
+helps['k8s-configuration flux delete'] = """
+    type: command
+    short-summary: Delete a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: Delete an existing Kubernetes Flux v2 Configuration
+        text: |-
+          az k8s-configuration flux delete --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig
+"""
+
+helps['k8s-configuration flux kustomization'] = """
+    type: group
+    short-summary: Commands to manage Kustomizations associated with Flux v2 Kubernetes configurations.
+"""
+
+helps['k8s-configuration flux kustomization create'] = """
+    type: command
+    short-summary: Create a Kustomization associated with a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: Create a Kustomization associated wiht a Kubernetes v2 Flux Configuration
+        text: |-
+          az k8s-configuration flux kustomization create --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig \\
+          --kustomization-name my-kustomization-2 --path ./my/path --prune --force
+"""
+
+helps['k8s-configuration flux kustomization update'] = """
+    type: command
+    short-summary: Update a Kustomization associated with a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: Update a Kustomization associated with a Kubernetes v2 Flux Configuration
+        text: |-
+          az k8s-configuration flux kustomization update --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig \\
+          --kustomization-name my-kustomization --path ./my/new-path --prune --force
+"""
+
+helps['k8s-configuration flux kustomization list'] = """
+    type: command
+    short-summary: List Kustomizations associated with a Kubernetes Flux v2 Configuration.
+    examples:
+      - name: List all Kustomizations associated with a Kubernetes Flux v2 Configuration on a cluster
+        text: |-
+          az k8s-configuration flux kustomization list --resource-group my-resource-group \\
+          --cluster-name mycluster --name myconfig --cluster-type connectedClusters
+"""
+
+helps['k8s-configuration flux kustomization show'] = """
+    type: command
+    short-summary: Show a Kustomization associated with a Flux v2 Configuration.
+    examples:
+      - name: Show details of a Kustomization associated with a Kubernetes Flux v2 Configuration
+        text: |-
+          az k8s-configuration flux kustomization show --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig \\
+          --kustomization-name my-kustomization
+"""
+
+helps['k8s-configuration flux kustomization delete'] = """
     type: command
-    short-summary: Update a Kubernetes configuration.
+    short-summary: Delete a Kustomization associated with a Kubernetes Flux v2 Configuration.
     examples:
-      - name: Update an existing Kubernetes configuration
+      - name: Delete an existing Kustomization associated with a Kubernetes Flux v2 Configuration
         text: |-
-            az k8s-configuration update --resource-group MyResourceGroup --cluster-name MyClusterName \\
-            --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \\
-            --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \\
-            --helm-operator-chart-version 1.4.0 --helm-operator-params '--set helm.versions=v3'
+          az k8s-configuration flux kustomization delete --resource-group my-resource-group \\
+          --cluster-name mycluster --cluster-type connectedClusters --name myconfig \\
+          --kustomization-name my-kustomization
 """