Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/run-integration-tests-canary-smi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
kubernetes-version: 1.31.0
driver: 'none'
timeout-minutes: 3

- name: Install Linkerd and SMI
run: |
curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install-edge | sh
export PATH=$PATH:/home/runner/.linkerd2/bin
curl -sL https://linkerd.github.io/linkerd-smi/install | sh
Expand Down
4 changes: 4 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ inputs:
skip-tls-verify:
description: True if the insecure-skip-tls-verify option should be used. Input should be 'true' or 'false'.
default: false
timeout:
description: 'Timeout for the rollout status'
required: false
default: 10m
Comment thread
benjaminbob21 marked this conversation as resolved.
resource-type:
description: Either Microsoft.ContainerService/managedClusters or Microsoft.ContainerService/fleets'.
required: false
Expand Down
265 changes: 0 additions & 265 deletions package-lock.json
Comment thread
benjaminbob21 marked this conversation as resolved.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions src/actions/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export async function deploy(
kubectl: Kubectl,
manifestFilePaths: string[],
deploymentStrategy: DeploymentStrategy,
resourceType: ClusterType
resourceType: ClusterType,
timeout?: string
Comment thread
benjaminbob21 marked this conversation as resolved.
) {
// update manifests
const inputManifestFiles: string[] = updateManifestFiles(manifestFilePaths)
Expand All @@ -36,7 +37,8 @@ export async function deploy(
inputManifestFiles,
deploymentStrategy,
kubectl,
trafficSplitMethod
trafficSplitMethod,
timeout
)
core.debug(`Deployed manifest files: ${deployedManifestFiles}`)
core.endGroup()
Expand All @@ -50,7 +52,7 @@ export async function deploy(
])
)

await checkManifestStability(kubectl, resourceTypes, resourceType)
await checkManifestStability(kubectl, resourceTypes, resourceType, timeout)
core.endGroup()

// print ingresses
Expand Down
Loading
Loading