Skip to content

Commit 96f374d

Browse files
authored
Fix Helm deployment issue: The ACR field was not listing the resource… (#20573)
* Fix Helm deployment issue: The ACR field was not listing the resource group containing the ACR resource.It was incorrectly filtering only resource groups with AKS resources. * update also the lock file
1 parent 04d380d commit 96f374d

File tree

9 files changed

+86
-100
lines changed

9 files changed

+86
-100
lines changed

Tasks/HelmDeployV1/package-lock.json

Lines changed: 32 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/HelmDeployV1/task.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},

Tasks/HelmDeployV1/task.loc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|1.247.2
2-
Node20_229_3|1.247.3
1+
Default|1.247.4
2+
Node20_229_3|1.247.5

_generated/HelmDeployV1/package-lock.json

Lines changed: 32 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_generated/HelmDeployV1/task.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},
@@ -562,7 +562,7 @@
562562
"KubeloginFailed": "Kubelogin authentication failed. Exception: %s"
563563
},
564564
"_buildConfigMapping": {
565-
"Default": "1.247.2",
566-
"Node20_229_3": "1.247.3"
565+
"Default": "1.247.4",
566+
"Node20_229_3": "1.247.5"
567567
}
568568
}

_generated/HelmDeployV1/task.loc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},
@@ -562,7 +562,7 @@
562562
"KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed"
563563
},
564564
"_buildConfigMapping": {
565-
"Default": "1.247.2",
566-
"Node20_229_3": "1.247.3"
565+
"Default": "1.247.4",
566+
"Node20_229_3": "1.247.5"
567567
}
568568
}

_generated/HelmDeployV1_Node20/task.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},
@@ -574,7 +574,7 @@
574574
"KubeloginFailed": "Kubelogin authentication failed. Exception: %s"
575575
},
576576
"_buildConfigMapping": {
577-
"Default": "1.247.2",
578-
"Node20_229_3": "1.247.3"
577+
"Default": "1.247.4",
578+
"Node20_229_3": "1.247.5"
579579
}
580580
}

_generated/HelmDeployV1_Node20/task.loc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"demands": [],
2020
"groups": [
@@ -485,7 +485,7 @@
485485
{
486486
"target": "azureResourceGroupForACR",
487487
"endpointId": "$(azureSubscriptionEndpointForACR)",
488-
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerService/managedClusters?api-version=2017-08-31",
488+
"endpointUrl": "{{{endpoint.url}}}/subscriptions/{{{endpoint.subscriptionId}}}/providers/Microsoft.ContainerRegistry/registries?api-version=2019-05-01",
489489
"resultSelector": "jsonpath:$.value[*]",
490490
"resultTemplate": "{{{ #extractResource id resourcegroups}}}"
491491
},
@@ -574,7 +574,7 @@
574574
"KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed"
575575
},
576576
"_buildConfigMapping": {
577-
"Default": "1.247.2",
578-
"Node20_229_3": "1.247.3"
577+
"Default": "1.247.4",
578+
"Node20_229_3": "1.247.5"
579579
}
580580
}

0 commit comments

Comments
 (0)