Skip to content

Commit b4464c5

Browse files
YevheniiKholodkovYevhenii Kholodkov
andauthored
Do not call kubelogin if external authentication is used, when connectionType = 'None' (#18683)
* do not call kubelogin if external auth is used in helmdeploy task --------- Co-authored-by: Yevhenii Kholodkov <[email protected]>
1 parent b28f830 commit b4464c5

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

Tasks/HelmDeployV0/src/helm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async function run() {
9393
}
9494

9595
const kubelogin = new Kubelogin(helmutil.getTaskTempDir());
96-
if (kubelogin.isAvailable()) {
96+
if (kubelogin.isAvailable() && !externalAuth) {
9797
tl.debug('Kubelogin is installed. Converting kubeconfig.');
9898
const serviceConnection: string = tl.getInput('azureSubscriptionEndpoint', false);
9999
try {

Tasks/HelmDeployV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 226,
17-
"Patch": 5
17+
"Patch": 7
1818
},
1919
"demands": [],
2020
"groups": [

Tasks/HelmDeployV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 226,
17-
"Patch": 5
17+
"Patch": 7
1818
},
1919
"demands": [],
2020
"groups": [
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|0.226.5
2-
Node16-225|0.226.4
1+
Default|0.226.7
2+
Node16-225|0.226.6

_generated/HelmDeployV0/src/helm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async function run() {
9393
}
9494

9595
const kubelogin = new Kubelogin(helmutil.getTaskTempDir());
96-
if (kubelogin.isAvailable()) {
96+
if (kubelogin.isAvailable() && !externalAuth) {
9797
tl.debug('Kubelogin is installed. Converting kubeconfig.');
9898
const serviceConnection: string = tl.getInput('azureSubscriptionEndpoint', false);
9999
try {

_generated/HelmDeployV0/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 226,
17-
"Patch": 5
17+
"Patch": 7
1818
},
1919
"demands": [],
2020
"groups": [
@@ -549,7 +549,7 @@
549549
"KubeloginFailed": "Kubelogin authentication failed. Exception: %s"
550550
},
551551
"_buildConfigMapping": {
552-
"Default": "0.226.5",
553-
"Node16-225": "0.226.4"
552+
"Default": "0.226.7",
553+
"Node16-225": "0.226.6"
554554
}
555555
}

_generated/HelmDeployV0/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 226,
17-
"Patch": 5
17+
"Patch": 7
1818
},
1919
"demands": [],
2020
"groups": [
@@ -549,7 +549,7 @@
549549
"KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed"
550550
},
551551
"_buildConfigMapping": {
552-
"Default": "0.226.5",
553-
"Node16-225": "0.226.4"
552+
"Default": "0.226.7",
553+
"Node16-225": "0.226.6"
554554
}
555555
}

_generated/HelmDeployV0_Node16/src/helm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async function run() {
9393
}
9494

9595
const kubelogin = new Kubelogin(helmutil.getTaskTempDir());
96-
if (kubelogin.isAvailable()) {
96+
if (kubelogin.isAvailable() && !externalAuth) {
9797
tl.debug('Kubelogin is installed. Converting kubeconfig.');
9898
const serviceConnection: string = tl.getInput('azureSubscriptionEndpoint', false);
9999
try {

_generated/HelmDeployV0_Node16/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 226,
17-
"Patch": 4
17+
"Patch": 6
1818
},
1919
"demands": [],
2020
"groups": [
@@ -561,7 +561,7 @@
561561
"KubeloginFailed": "Kubelogin authentication failed. Exception: %s"
562562
},
563563
"_buildConfigMapping": {
564-
"Default": "0.226.5",
565-
"Node16-225": "0.226.4"
564+
"Default": "0.226.7",
565+
"Node16-225": "0.226.6"
566566
}
567567
}

_generated/HelmDeployV0_Node16/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 226,
17-
"Patch": 4
17+
"Patch": 6
1818
},
1919
"demands": [],
2020
"groups": [
@@ -561,7 +561,7 @@
561561
"KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed"
562562
},
563563
"_buildConfigMapping": {
564-
"Default": "0.226.5",
565-
"Node16-225": "0.226.4"
564+
"Default": "0.226.7",
565+
"Node16-225": "0.226.6"
566566
}
567567
}

0 commit comments

Comments
 (0)