Skip to content

Commit b3205f1

Browse files
committed
Cleanup, removing unused CLI arguments
1 parent c43902a commit b3205f1

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

cmd/ciCloudLogin.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ var cloudLoginCmd = &cobra.Command{
4848
- "--aks-tenant-id" flag or "AKS_TENANT_ID" environment variable
4949
- "--aks-sp-app-id" flag or "AKS_SP_APP_ID" environment variable
5050
- "--aks-sp-password" flag or "AKS_SP_PASSWORD" environment variable
51-
- "--aks-subscription-id" flag or "AKS_SP_PASSWORD" environment variable
5251
`,
5352
Run: func(cmd *cobra.Command, args []string) {
5453

cmd/ciImageBuild.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ var ciImageBuildCmd = &cobra.Command{
133133
imageUrl := fmt.Sprintf("%s/%s/%s-%s", imageRepoHost, imageRepoProject, namespace, imageIdentifier)
134134

135135
command := fmt.Sprintf("docker manifest inspect '%s/%s/%s-%s:%s' > /dev/null 2>&1", imageRepoHost, imageRepoProject, namespace, imageIdentifier, imageTag)
136-
// command := fmt.Sprintf("az acr repository show --name '%s' --image '%s/%s-%s:%s' --only-show-errors 2>&1 > /dev/null", imageRepoHost, imageRepoProject, namespace, imageIdentifier, imageTag)
137136
err := exec.Command("bash", "-c", command).Run()
138137
if err == nil {
139138
fmt.Printf("Image %s:%s already exists, existing image will be used.", imageUrl, imageTag)

cmd/ciImageLogin.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,7 @@ Available flags and environment variables:
125125
command = fmt.Sprintf("aws ecr get-login --no-include-email | bash")
126126

127127
} else if aksSPPass != "" {
128-
// // AKS & ACR Login
129-
// command = fmt.Sprintf("az login --service-principal --username '%s' --tenant '%s' --password '%s';\n", aksSPAppID, aksTenantID, aksSPPass)
130-
// command += fmt.Sprintf("az acr login --name '%s' --only-show-errors", imageRepoHost)
131-
//command = fmt.Sprintf("az login --service-principal --username '%s' --tenant '%s' --password '%s';\n", aksSPAppID, aksTenantID, aksSPPass)
128+
// ACR Login
132129
command = fmt.Sprintf("echo %q | docker login --username %q --password-stdin %s", aksSPPass, aksSPAppID, imageRepoHost)
133130
}
134131

0 commit comments

Comments
 (0)