Skip to content

Commit

Permalink
Updated properties for supporting private link (Azure#13604)
Browse files Browse the repository at this point in the history
* added private link scope id property

* fixed update example

* updated private link properties

* added separate examples for private link

* updated example

* removed default value in patch

* changed boolean property to enum

Co-authored-by: Akash Keshari <[email protected]>
  • Loading branch information
2 people authored and mkarmark committed Jul 20, 2021
1 parent 68ba174 commit a4ab614
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"x-ms-examples": {
"CreateClusterExample": {
"$ref": "./examples/CreateClusterExample.json"
},
"CreateClusterPrivateLinkExample": {
"$ref": "./examples/CreateClusterPrivateLinkExample.json"
}
},
"parameters": [
Expand Down Expand Up @@ -105,6 +108,9 @@
"x-ms-examples": {
"UpdateClusterExample": {
"$ref": "./examples/UpdateClusterExample.json"
},
"UpdateClusterPrivateLinkExample": {
"$ref": "./examples/UpdateClusterPrivateLinkExample.json"
}
},
"parameters": [
Expand Down Expand Up @@ -614,6 +620,19 @@
"modelAsString": true
}
},
"privateLinkState": {
"type": "string",
"description": "Property which describes the state of private link on a connected cluster resource.",
"default": "Disabled",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PrivateLinkState",
"modelAsString": true
}
},
"privateLinkScopeResourceId": {
"type": "string",
"description": "The resource id of the private link scope this connected cluster is assigned to, if any."
Expand Down Expand Up @@ -694,6 +713,18 @@
"ConnectedClusterPatchProperties": {
"type": "object",
"properties": {
"privateLinkState": {
"type": "string",
"description": "Property which describes the state of private link on a connected cluster resource.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PrivateLinkState",
"modelAsString": true
}
},
"privateLinkScopeResourceId": {
"type": "string",
"description": "The resource id of the private link scope this connected cluster is assigned to, if any."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"type": "SystemAssigned"
},
"properties": {
"agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName"
"agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO"
}
}
},
Expand Down Expand Up @@ -40,7 +39,6 @@
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Succeeded"
}
}
Expand Down Expand Up @@ -68,7 +66,6 @@
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Accepted"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"parameters": {
"subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5",
"resourceGroupName": "k8sc-rg",
"clusterName": "testCluster",
"api-version": "2021-04-01-preview",
"ConnectedCluster": {
"location": "East US",
"tags": {},
"identity": {
"type": "SystemAssigned"
},
"properties": {
"agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO",
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1",
"name": "connectedCluster1",
"type": "Microsoft.Kubernetes/connectedClusters",
"location": "East US",
"tags": {},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2020-12-17T07:06:33.9173186Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2020-12-17T07:06:33.9173186Z"
},
"identity": {
"type": "SystemAssigned"
},
"properties": {
"agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO",
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Succeeded"
}
}
},
"201": {
"body": {
"id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1",
"name": "connectedCluster1",
"type": "Microsoft.Kubernetes/connectedClusters",
"location": "East US",
"tags": {},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2020-12-17T07:06:33.9173186Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2020-12-17T07:06:33.9173186Z"
},
"identity": {
"type": "SystemAssigned"
},
"properties": {
"agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO",
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Accepted"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"privateLinkState": "Disabled",
"provisioningState": "Succeeded"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkState": "Disabled",
"provisioningState": "Succeeded"
}
},
Expand Down Expand Up @@ -59,6 +60,7 @@
"kubernetesVersion": "1.1",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Succeeded"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkState": "Disabled",
"provisioningState": "Succeeded"
}
},
Expand Down Expand Up @@ -58,6 +59,7 @@
"kubernetesVersion": "1.16.3",
"totalNodeCount": 4,
"agentVersion": "0.1.0",
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Succeeded"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"tags": {
"tag1": "value1",
"tag2": "value2"
},
"properties": {
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName"
}
}
},
Expand All @@ -21,7 +18,10 @@
"name": "connectedCluster1",
"type": "Microsoft.Kubernetes/connectedClusters",
"location": "East US",
"tags": {},
"tags": {
"tag1": "value1",
"tag2": "value2"
},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
Expand All @@ -38,7 +38,7 @@
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"privateLinkState": "Disabled",
"provisioningState": "Succeeded"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"parameters": {
"api-version": "2021-04-01-preview",
"subscriptionId": "1bfbb5d0-917e-4346-9026-1d3b344417f5",
"resourceGroupName": "k8sc-rg",
"clusterName": "testCluster",
"ConnectedClusterPatch": {
"tags": {
"tag1": "value1",
"tag2": "value2"
},
"properties": {
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/1bfbb5d0-917e-4346-9026-1d3b344417f5/resourceGroups/akkeshar/providers/Microsoft.Kubernetes/connectedClusters/connectedCluster1",
"name": "connectedCluster1",
"type": "Microsoft.Kubernetes/connectedClusters",
"location": "East US",
"tags": {},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2020-12-17T07:06:33.9173186Z",
"lastModifiedBy": "2d2a754c-cade-4935-83d4-ce413c5a3910",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-12-17T07:14:58.865041Z"
},
"identity": {
"type": "SystemAssigned"
},
"properties": {
"agentPublicKeyCertificate": "MIICYzCCAcygAwIBAgIBADANBgkqhkiG9w0BAQUFADAuMQswCQYDVQQGEwJVUzEMMAoGA1UEChMDSUJNMREwDwYDVQQLEwhMb2NhbCBDQTAeFw05OTEyMjIwNTAwMDBaFw0wMDEyMjMwNDU5NTlaMC4xCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNJQk0xETAPBgNVBAsTCExvY2FsIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD2bZEo7xGaX2/0GHkrNFZvlxBou9v1Jmt/PDiTMPve8r9FeJAQ0QdvFST/0JPQYD20rH0bimdDLgNdNynmyRoS2S/IInfpmf69iyc2G0TPyRvmHIiOZbdCd+YBHQi1adkj17NDcWj6S14tVurFX73zx0sNoMS79q3tuXKrDsxeuwIDAQABo4GQMIGNMEsGCVUdDwGG+EIBDQQ+EzxHZW5lcmF0ZWQgYnkgdGhlIFNlY3VyZVdheSBTZWN1cml0eSBTZXJ2ZXIgZm9yIE9TLzM5MCAoUkFDRikwDgYDVR0PAQH/BAQDAgAGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ3+ocRyCTJw067dLSwr/nalx6YMMA0GCSqGSIb3DQEBBQUAA4GBAMaQzt+zaj1GU77yzlr8iiMBXgdQrwsZZWJo5exnAucJAEYQZmOfyLiM D6oYq+ZnfvM0n8G/Y79q8nhwvuxpYOnRSAXFp6xSkrIOeZtJMY1h00LKp/JX3Ng1svZ2agE126JHsQ0bhzN5TKsYfbwfTwfjdWAGy6Vf1nYi/rO+ryMO",
"kubernetesVersion": "1.17.0",
"totalNodeCount": 2,
"agentVersion": "0.1.0",
"privateLinkState": "Enabled",
"privateLinkScopeResourceId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.HybridCompute/privateLinkScopes/privateLinkScopeName",
"provisioningState": "Succeeded"
}
}
}
}
}

0 comments on commit a4ab614

Please sign in to comment.