Merge branch 'main' into dependabot/go_modules/k8s.io/apimachinery-0.33.0

bosesuneha · web-flow · commit 8eab321b5def · 2025-05-27T13:23:04.000-07:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
diff --git a/.github/workflows/e2e-info.yml b/.github/workflows/e2e-info.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: 1.22
       - name: make
diff --git a/.github/workflows/integration-json.yml b/.github/workflows/integration-json.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: 1.22
       - name: make
diff --git a/.github/workflows/integration-per-language.yml b/.github/workflows/integration-per-language.yml
@@ -164,7 +164,7 @@ jobs:
           pwd
       # Validate generated workflow yaml
       - name: Install action-validator with asdf
-        uses: asdf-vm/actions/install@v3
+        uses: asdf-vm/actions/install@v4
         with:
           tool_versions: |
             action-validator 0.1.2
@@ -337,7 +337,7 @@ jobs:
           pwd
       # Validate generated workflow yaml
       - name: Install action-validator with asdf
-        uses: asdf-vm/actions/install@v3
+        uses: asdf-vm/actions/install@v4
         with:
           tool_versions: |
             action-validator 0.1.2
@@ -500,7 +500,7 @@ jobs:
           --variable NAMESPACE=default
       # Validate generated workflow yaml
       - name: Install action-validator with asdf
-        uses: asdf-vm/actions/install@v3
+        uses: asdf-vm/actions/install@v4
         with:
           tool_versions: |
             action-validator 0.1.2
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: 1.22
       - name: make
@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: 1.22
       - name: make
diff --git a/.github/workflows/release-and-publish.yml b/.github/workflows/release-and-publish.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Make Release Dir
       run: mkdir bin
     - name: Set up Go
-      uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       with:
         go-version: 1.22
     # Check if the newest tag already exists
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: 1.22
       - name: make
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## [0.17.12] - 2025-05-16
+
+- [564](https://github.com/Azure/draft/pull/564) fix interactive bug
+- [567](https://github.com/Azure/draft/pull/567) add azlogin step
+
+## [0.17.11] - 2025-05-06
+
+- [558](https://github.com/Azure/draft/pull/558) Add new parameter `DOCKERFILE`and env var `dockerfile` to pass the dockerfile path in the az pipeline template
+
 ## [0.17.10] - 2025-04-25
 
 - [547](https://github.com/Azure/draft/pull/547) Fix deployment templates to have `azure.workload.identity/use` label in pod level spec
diff --git a/cmd/create.go b/cmd/create.go
@@ -125,6 +125,7 @@ func (cc *createCmd) initConfig() error {
 
 func (cc *createCmd) run() error {
 	log.Debugf("config: %s", cc.createConfigPath)
+	log.Debugf("interactive: %t", interactive)
 
 	flagVariablesMap = flagVariablesToMap(cc.flagVariables)
 
diff --git a/cmd/root.go b/cmd/root.go
@@ -63,6 +63,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&provider, "provider", "p", "azure", "cloud provider")
 	rootCmd.PersistentFlags().BoolVarP(&silent, "silent", "", false, "enable silent logging")
 	rootCmd.PersistentFlags().BoolVarP(&dryRun, "dry-run", "", false, "enable dry run mode in which no files are written to disk")
-	rootCmd.PersistentFlags().BoolVarP(&interactive, "interactive", "", false, "toggle interactive prompting for user input (default is true, use --interactive=false to disable)")
+	rootCmd.PersistentFlags().BoolVarP(&interactive, "interactive", "", true, "toggle interactive prompting for user input (default is true, use --interactive=false to disable)")
 	rootCmd.PersistentFlags().StringVar(&dryRunFile, "dry-run-file", "", "optional file to write dry run summary in json format into (requires --dry-run flag)")
 }
diff --git a/pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml b/pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml
@@ -11,6 +11,7 @@ variables:
   kustomizePath: ./overlays/production
   namespace: default
   buildContextPath: .
+  dockerfile: ./Dockerfile
   tag: "$(Build.BuildId)"
   vmImageName: "ubuntu-latest"
 
@@ -35,8 +36,8 @@ stages:
               scriptType: "bash"
               scriptLocation: "inlineScript"
               inlineScript: |
-                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 $(buildContextPath)
-              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg)"
+                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 -f $5 $6
+              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg) $(dockerfile) $(buildContextPath)"
 
   - stage: Deploy
     displayName: Deploy stage
diff --git a/pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml b/pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml
@@ -8,9 +8,10 @@ variables:
   clusterRg: myrg
   acrRg: myrg
   clusterName: testcluster
-  manifestPath: ./manifests
+  manifestPath: ./manifests/*
   namespace: default
   buildContextPath: .
+  dockerfile: ./Dockerfile
   tag: "$(Build.BuildId)"
   vmImageName: "ubuntu-latest"
 
@@ -35,8 +36,8 @@ stages:
               scriptType: "bash"
               scriptLocation: "inlineScript"
               inlineScript: |
-                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 $(buildContextPath)
-              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg)"
+                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 -f $5 $6
+              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg) $(dockerfile) $(buildContextPath)"
 
   - stage: Deploy
     displayName: Deploy stage
diff --git a/pkg/fixtures/workflows/github/manifests/.github/workflows/azure-kubernetes-service.yml b/pkg/fixtures/workflows/github/manifests/.github/workflows/azure-kubernetes-service.yml
@@ -84,6 +84,11 @@ jobs:
       # Checks out the repository this file is in
       - uses: actions/checkout@v3
 
+      # Logs into ACR
+      - name: Log into ACR
+        run: |
+          az acr login -n ${{ env.AZURE_CONTAINER_REGISTRY }}
+
       # Logs in with your Azure credentials
       - name: Azure login
         uses: azure/login@v2.2.0
diff --git a/template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml b/template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml
@@ -11,6 +11,7 @@ variables:
   kustomizePath: {{ .Config.GetVariableValue "KUSTOMIZEPATH" }}
   namespace: {{ .Config.GetVariableValue "NAMESPACE" }}
   buildContextPath: {{ .Config.GetVariableValue "BUILDCONTEXTPATH" }}
+  dockerfile: {{ .Config.GetVariableValue "DOCKERFILE" }}
   tag: "$(Build.BuildId)"
   vmImageName: "ubuntu-latest"
 
@@ -35,8 +36,8 @@ stages:
               scriptType: "bash"
               scriptLocation: "inlineScript"
               inlineScript: |
-                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 $(buildContextPath)
-              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg)"
+                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 -f $5 $6
+              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg) $(dockerfile) $(buildContextPath)"
 
   - stage: Deploy
     displayName: Deploy stage
diff --git a/template/azurePipelines/kustomize/draft.yaml b/template/azurePipelines/kustomize/draft.yaml
@@ -70,3 +70,10 @@ variables:
       value: "."
     description: "the path to the Docker build context"
     versions: ">=0.0.1"
+  - name: "DOCKERFILE"
+    type: "string"
+    kind: "filePath"
+    default:
+      value: "./Dockerfile"
+    description: "the path to the Dockerfile"
+    versions: ">=0.0.1"
diff --git a/template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml b/template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml
@@ -11,6 +11,7 @@ variables:
   manifestPath: {{ .Config.GetVariableValue "MANIFESTPATH" }}
   namespace: {{ .Config.GetVariableValue "NAMESPACE" }}
   buildContextPath: {{ .Config.GetVariableValue "BUILDCONTEXTPATH" }}
+  dockerfile: {{ .Config.GetVariableValue "DOCKERFILE" }}
   tag: "$(Build.BuildId)"
   vmImageName: "ubuntu-latest"
 
@@ -35,8 +36,8 @@ stages:
               scriptType: "bash"
               scriptLocation: "inlineScript"
               inlineScript: |
-                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 $(buildContextPath)
-              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg)"
+                az acr build --image $1.azurecr.io/$2:$3 --registry $1 -g $4 -f $5 $6
+              arguments: "$(azureContainerRegistry) $(containerName) $(tag) $(acrRg) $(dockerfile) $(buildContextPath)"
 
   - stage: Deploy
     displayName: Deploy stage
diff --git a/template/azurePipelines/manifests/draft.yaml b/template/azurePipelines/manifests/draft.yaml
@@ -53,7 +53,7 @@ variables:
     kind: "dirPath"
     default:
       disablePrompt: true
-      value: "./manifests"
+      value: "./manifests/*"
     description: "the path to the Kubernetes deployment manifest"
     versions: ">=0.0.1"
   - name: "NAMESPACE"
@@ -70,3 +70,10 @@ variables:
       value: "."
     description: "the path to the Docker build context"
     versions: ">=0.0.1"
+  - name: "DOCKERFILE"
+    type: "string"
+    kind: "filePath"
+    default:
+      value: "./Dockerfile"
+    description: "the path to the Dockerfile"
+    versions: ">=0.0.1"
diff --git a/template/dockerfiles/rust/draft.yaml b/template/dockerfiles/rust/draft.yaml
@@ -17,7 +17,7 @@ variables:
     type: "string"
     kind: "containerImageVersion"
     default:
-      value: "1.70.0"
+      value: "1.82.0"
     description: "the version of rust used by the application"
     exampleValues: ["1.70.0", "1.65.0", "1.60", "1.54", "1.53"]
     versions: ">=0.0.1"
diff --git a/template/workflows/manifests/.github/workflows/azure-kubernetes-service.yml b/template/workflows/manifests/.github/workflows/azure-kubernetes-service.yml
@@ -70,6 +70,11 @@ jobs:
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           auth-type: ${{ env.AUTH_TYPE }}
 
+      # Logs into ACR
+      - name: Log into ACR
+        run: |
+          az acr login -n ${{ env.AZURE_CONTAINER_REGISTRY }}
+
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
         run: |
diff --git a/test/integration/rust/helm.yaml b/test/integration/rust/helm.yaml
@@ -12,7 +12,7 @@ deployVariables:
     value: "host.minikube.internal:5001/testapp"
 languageVariables:
   - name: "VERSION"
-    value: "1.81.0"
+    value: "1.82.0"
   - name: "BUILDERVERSION"
     value: "null"
   - name: "PORT"
diff --git a/test/integration/rust/kustomize.yaml b/test/integration/rust/kustomize.yaml
@@ -12,7 +12,7 @@ deployVariables:
     value: "host.minikube.internal:5001/testapp"
 languageVariables:
   - name: "VERSION"
-    value: "1.81.0"
+    value: "1.82.0"
   - name: "BUILDERVERSION"
     value: "null"
   - name: "PORT"
diff --git a/test/integration/rust/manifest.yaml b/test/integration/rust/manifest.yaml
@@ -12,7 +12,7 @@ deployVariables:
     value: "host.minikube.internal:5001/testapp"
 languageVariables:
   - name: "VERSION"
-    value: "1.81.0"
+    value: "1.82.0"
   - name: "BUILDERVERSION"
     value: "null"
   - name: "PORT"

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ func init() {`
`63`	`63`	`rootCmd.PersistentFlags().StringVarP(&provider, "provider", "p", "azure", "cloud provider")`
`64`	`64`	`rootCmd.PersistentFlags().BoolVarP(&silent, "silent", "", false, "enable silent logging")`
`65`	`65`	`rootCmd.PersistentFlags().BoolVarP(&dryRun, "dry-run", "", false, "enable dry run mode in which no files are written to disk")`
`66`		`- rootCmd.PersistentFlags().BoolVarP(&interactive, "interactive", "", false, "toggle interactive prompting for user input (default is true, use --interactive=false to disable)")`
	`66`	`+ rootCmd.PersistentFlags().BoolVarP(&interactive, "interactive", "", true, "toggle interactive prompting for user input (default is true, use --interactive=false to disable)")`
`67`	`67`	`rootCmd.PersistentFlags().StringVar(&dryRunFile, "dry-run-file", "", "optional file to write dry run summary in json format into (requires --dry-run flag)")`
`68`	`68`	`}`