Skip to content

Commit fe9b667

Browse files
audrastumpaudrastump
authored
Merge branch 'main' into fleetBump
2 parents 730a22a + de8afa9 commit fe9b667

152 files changed

Lines changed: 5114 additions & 4324 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/dependabot.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,10 @@ updates:
44
directory: /
55
schedule:
66
interval: "weekly"
7-
groups:
8-
# Group updates together, so that they are all applied in a single PR.
9-
# Grouped updates are currently in beta and is subject to change.
10-
# xref: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
11-
k8s-go-deps:
12-
patterns:
13-
- "k8s.io/*"
14-
- "sigs.k8s.io/*"
15-
go-deps:
16-
patterns:
17-
- "*"
18-
exclude-patterns:
19-
- "k8s.io/*"
20-
- "sigs.k8s.io/*"
217
- package-ecosystem: "github-actions"
228
directory: ".github/workflows"
239
schedule:
2410
interval: weekly
25-
groups:
26-
actions:
27-
patterns:
28-
- "*"
2911
- package-ecosystem: "github-actions"
3012
directory: "/template/workflows/helm/.github/workflows"
3113
schedule:

‎.github/workflows/e2e-info.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
deployments: read
1313
packages: none
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up Go
17-
uses: actions/setup-go@v3
17+
uses: actions/setup-go@v5
1818
with:
1919
go-version: 1.22
2020
- name: make

‎.github/workflows/integration-install.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
deployments: read
1616
packages: none
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Get Draft Cli version
20-
uses: actions/github-script@v6
20+
uses: actions/github-script@v7
2121
id: get_draft_version
2222
with:
2323
result-encoding: string

‎.github/workflows/integration-json.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
deployments: read
1313
packages: none
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Set up Go
17-
uses: actions/setup-go@v2
17+
uses: actions/setup-go@v5
1818
with:
1919
go-version: 1.22
2020
- name: make
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
needs: build
3636
steps:
37-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v4
3838
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
3939
with:
4040
name: draft-binary

‎.github/workflows/integration-per-language.yml‎

Lines changed: 103 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ jobs:
506506
- name: Fail if any error
507507
if: steps.deploy.outcome != 'success' || steps.rollout.outcome != 'success'
508508
run: exit 6
509-
manifest_update_job_name:
509+
manifest-update:
510510
needs: manifests-create
511511
runs-on: ubuntu-latest
512512
env:
@@ -556,3 +556,105 @@ jobs:
556556
kubectl get po
557557
echo "Deployment failed, check above logs and previous steps to isolate the issue"
558558
exit 6
559+
560+
win-helm-create:
561+
runs-on: windows-latest
562+
steps:
563+
- uses: actions/checkout@v4
564+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
565+
with:
566+
name: draft-binary-win
567+
- run: mkdir ./langtest
568+
- uses: actions/checkout@v4
569+
with:
570+
repository: ${{ inputs.repo }}
571+
path: ./langtest
572+
- run: Remove-Item ./langtest/manifests -Recurse -Force -ErrorAction Ignore
573+
- run: Remove-Item ./langtest/base -Recurse -Force -ErrorAction Ignore
574+
- run: Remove-Item ./langtest/overlays -Recurse -Force -ErrorAction Ignore
575+
- run: Remove-Item ./langtest/charts -Recurse -Force -ErrorAction Ignore
576+
- run: Remove-Item ./langtest/Dockerfile -ErrorAction Ignore
577+
- run: Remove-Item ./langtest/.dockerignore -ErrorAction Ignore
578+
- run: ./draft.exe -v create -c ./test/integration/${{inputs.language}}/helm.yaml -d ./langtest/
579+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
580+
with:
581+
name: check_windows_helm
582+
path: ./langtest/
583+
- run: ./check_windows_helm.ps1
584+
working-directory: ./langtest/
585+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
586+
with:
587+
name: ${{inputs.language}}-win-helm-create
588+
path: |
589+
./langtest
590+
!./langtest/**/.git/*
591+
win-helm-update:
592+
needs: win-helm-create
593+
runs-on: windows-latest
594+
steps:
595+
- uses: actions/checkout@v4
596+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
597+
with:
598+
name: draft-binary-win
599+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
600+
with:
601+
name: ${{inputs.language}}-win-helm-create
602+
path: ./langtest/
603+
- run: Remove-Item ./langtest/charts/templates/ingress.yaml -Recurse -Force -ErrorAction Ignore
604+
- run: ./draft.exe -v update -d ./langtest/ -a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1
605+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
606+
with:
607+
name: check_windows_addon_helm
608+
path: ./langtest/
609+
- run: ./check_windows_addon_helm.ps1
610+
working-directory: ./langtest/
611+
win-kustomize-create:
612+
runs-on: windows-latest
613+
steps:
614+
- uses: actions/checkout@v4
615+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
616+
with:
617+
name: draft-binary-win
618+
- run: mkdir ./langtest
619+
- uses: actions/checkout@v4
620+
with:
621+
repository: ${{ inputs.repo }}
622+
path: ./langtest
623+
- run: Remove-Item ./langtest/manifests -Recurse -Force -ErrorAction Ignore
624+
- run: Remove-Item ./langtest/base -Recurse -Force -ErrorAction Ignore
625+
- run: Remove-Item ./langtest/overlays -Recurse -Force -ErrorAction Ignore
626+
- run: Remove-Item ./langtest/charts -Recurse -Force -ErrorAction Ignore
627+
- run: Remove-Item ./langtest/Dockerfile -ErrorAction Ignore
628+
- run: Remove-Item ./langtest/.dockerignore -ErrorAction Ignore
629+
- run: ./draft.exe -v create -c ./test/integration/${{ inputs.language }}/kustomize.yaml -d ./langtest/
630+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
631+
with:
632+
name: check_windows_kustomize
633+
path: ./langtest/
634+
- run: ./check_windows_kustomize.ps1
635+
working-directory: ./langtest/
636+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
637+
with:
638+
name: ${{ inputs.language }}-win-kustomize-create
639+
path: |
640+
./langtest
641+
!./langtest/**/.git/*
642+
win-kustomize-update:
643+
needs: win-kustomize-create
644+
runs-on: windows-latest
645+
steps:
646+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
647+
with:
648+
name: draft-binary-win
649+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
650+
with:
651+
name: ${{inputs.language}}-win-kustomize-create
652+
path: ./langtest
653+
- run: Remove-Item ./langtest/overlays/production/ingress.yaml -ErrorAction Ignore
654+
- run: ./draft.exe -v update -d ./langtest/ -a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1
655+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
656+
with:
657+
name: check_windows_addon_kustomize
658+
path: ./langtest/
659+
- run: ./check_windows_addon_kustomize.ps1
660+
working-directory: ./langtest/

‎.github/workflows/integration-tests.yml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# this file is generated using gen_integration.sh
2+
name: Integration Tests
3+
on:
4+
pull_request:
5+
branches: [main, staging]
6+
workflow_dispatch:
7+
jobs:
8+
build-linux:
9+
name: Build Draft Linux Binary
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- name: Set up Go
14+
uses: actions/setup-go@v5
15+
with:
16+
go-version: 1.22
17+
- name: make
18+
run: make
19+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
20+
with:
21+
name: helm-skaffold
22+
path: ./test/skaffold.yaml
23+
if-no-files-found: error
24+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
25+
with:
26+
name: draft-binary
27+
path: ./draft
28+
if-no-files-found: error
29+
build-windows:
30+
name: Build Draft Windows Binary
31+
runs-on: windows-latest
32+
steps:
33+
- uses: actions/checkout@v4
34+
- name: Set up Go
35+
uses: actions/setup-go@v5
36+
with:
37+
go-version: 1.22
38+
- name: make
39+
run: make
40+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
41+
with:
42+
name: draft-binary-win
43+
path: ./draft.exe
44+
if-no-files-found: error
45+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
46+
with:
47+
name: check_windows_helm
48+
path: ./test/check_windows_helm.ps1
49+
if-no-files-found: error
50+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
51+
with:
52+
name: check_windows_addon_helm
53+
path: ./test/check_windows_addon_helm.ps1
54+
if-no-files-found: error
55+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
56+
with:
57+
name: check_windows_kustomize
58+
path: ./test/check_windows_kustomize.ps1
59+
if-no-files-found: error
60+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
61+
with:
62+
name: check_windows_addon_kustomize
63+
path: ./test/check_windows_addon_kustomize.ps1
64+
if-no-files-found: error
65+
language-integration-test:
66+
name: Matrix
67+
needs:
68+
- build-linux
69+
- build-windows
70+
strategy:
71+
matrix:
72+
language: ["gomodule"] # we dont actually want a matrix here, so we include cases individually
73+
repo: ["davidgamero/go_echo"]
74+
include:
75+
- language: "go"
76+
repo: "davidgamero/go-echo-no-mod"
77+
- language: "python"
78+
repo: "OliverMKing/flask-hello-world"
79+
- language: "rust"
80+
repo: "OliverMKing/tiny-http-hello-world"
81+
- language: "javascript"
82+
repo: "davidgamero/express-hello-world"
83+
- language: "ruby"
84+
repo: "davidgamero/sinatra-hello-world"
85+
- language: "csharp"
86+
repo: "imiller31/csharp-simple-web-app"
87+
- language: "java"
88+
repo: "imiller31/simple-java-server"
89+
- language: "gradle"
90+
repo: "imiller31/simple-gradle-server"
91+
- language: "swift"
92+
repo: "OliverMKing/swift-hello-world"
93+
- language: "erlang"
94+
repo: "bfoley13/ErlangExample"
95+
- language: "clojure"
96+
repo: "imiller31/clojure-simple-http"
97+
uses: ./.github/workflows/integration-per-language.yml
98+
with:
99+
language: ${{ matrix.language }}
100+
repo: ${{ matrix.repo }}
101+
linux-integration-summary:
102+
name: Integration Test Summary
103+
needs: language-integration-test
104+
runs-on: ubuntu-latest
105+
steps:
106+
- run: |
107+
echo "Success"

0 commit comments

Comments
 (0)