Skip to content

Commit 5dbe7fa

Browse files
bosesunehabosesuneha
authored
Merge branch 'main' into sunehabose/release-v0.17.2
2 parents f3107ba + 4231961 commit 5dbe7fa

File tree

6 files changed

+147
-37
lines changed

6 files changed

+147
-37
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ jobs:
158158
--variable CONTAINERNAME=someContainer \
159159
--variable CLUSTERRESOURCEGROUP=someClusterResourceGroup \
160160
--variable CLUSTERNAME=someAksCluster \
161-
--variable CLUSTERRESOURCETYPE=Microsoft.ContainerService/managedClusters \
162161
--variable DOCKERFILE=./Dockerfile \
163162
--variable BUILDCONTEXTPATH=. \
164163
--variable NAMESPACE=default
@@ -332,7 +331,6 @@ jobs:
332331
--variable CONTAINERNAME=someContainer \
333332
--variable CLUSTERRESOURCEGROUP=someClusterResourceGroup \
334333
--variable CLUSTERNAME=someAksCluster \
335-
--variable CLUSTERRESOURCETYPE=Microsoft.ContainerService/managedClusters \
336334
--variable DOCKERFILE=./Dockerfile \
337335
--variable BUILDCONTEXTPATH=. \
338336
--variable NAMESPACE=default
@@ -486,7 +484,20 @@ jobs:
486484
curl -m 3 $SERVICEIP:${{env.serviceport}}
487485
sleep 5
488486
kill $tunnelPID
489-
- run: ./draft -v generate-workflow -d ./langtest/ --deploy-type manifests --variable WORKFLOWNAME=someWorkflow --variable BRANCHNAME=main --variable ACRRESOURCEGROUP=someAcrResourceGroup --variable AZURECONTAINERREGISTRY=someRegistry --variable CONTAINERNAME=someContainer --variable CLUSTERRESOURCEGROUP=someClusterResourceGroup --variable CLUSTERNAME=someAksCluster --variable CLUSTERRESOURCETYPE=Microsoft.ContainerService/managedClusters --variable DOCKERFILE=./Dockerfile --variable BUILDCONTEXTPATH=. --variable NAMESPACE=default
487+
- run: |
488+
./draft -v generate-workflow \
489+
-d ./langtest/ \
490+
--deploy-type manifests \
491+
--variable WORKFLOWNAME=someWorkflow \
492+
--variable BRANCHNAME=main \
493+
--variable ACRRESOURCEGROUP=someAcrResourceGroup \
494+
--variable AZURECONTAINERREGISTRY=someRegistry \
495+
--variable CONTAINERNAME=someContainer \
496+
--variable CLUSTERRESOURCEGROUP=someClusterResourceGroup \
497+
--variable CLUSTERNAME=someAksCluster \
498+
--variable DOCKERFILE=./Dockerfile \
499+
--variable BUILDCONTEXTPATH=. \
500+
--variable NAMESPACE=default
490501
# Validate generated workflow yaml
491502
- name: Install action-validator with asdf
492503
uses: asdf-vm/actions/install@v1

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

Lines changed: 108 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -62,46 +62,120 @@ jobs:
6262
name: check_windows_addon_kustomize
6363
path: ./test/check_windows_addon_kustomize.ps1
6464
if-no-files-found: error
65-
language-integration-test:
66-
name: Matrix
65+
gomodule:
6766
needs:
6867
- build-linux
6968
- 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"
9769
uses: ./.github/workflows/integration-per-language.yml
9870
with:
99-
language: ${{ matrix.language }}
100-
repo: ${{ matrix.repo }}
101-
linux-integration-summary:
71+
language: gomodule
72+
repo: davidgamero/go_echo
73+
go:
74+
needs:
75+
- build-linux
76+
- build-windows
77+
uses: ./.github/workflows/integration-per-language.yml
78+
with:
79+
language: go
80+
repo: "davidgamero/go-echo-no-mod"
81+
python:
82+
needs:
83+
- build-linux
84+
- build-windows
85+
uses: ./.github/workflows/integration-per-language.yml
86+
with:
87+
language: "python"
88+
repo: "OliverMKing/flask-hello-world"
89+
rust:
90+
needs:
91+
- build-linux
92+
- build-windows
93+
uses: ./.github/workflows/integration-per-language.yml
94+
with:
95+
language: "rust"
96+
repo: "OliverMKing/tiny-http-hello-world"
97+
javascript:
98+
needs:
99+
- build-linux
100+
- build-windows
101+
uses: ./.github/workflows/integration-per-language.yml
102+
with:
103+
language: "javascript"
104+
repo: "davidgamero/express-hello-world"
105+
ruby:
106+
needs:
107+
- build-linux
108+
- build-windows
109+
uses: ./.github/workflows/integration-per-language.yml
110+
with:
111+
language: "ruby"
112+
repo: "davidgamero/sinatra-hello-world"
113+
csharp:
114+
needs:
115+
- build-linux
116+
- build-windows
117+
uses: ./.github/workflows/integration-per-language.yml
118+
with:
119+
language: "csharp"
120+
repo: "imiller31/csharp-simple-web-app"
121+
java:
122+
needs:
123+
- build-linux
124+
- build-windows
125+
uses: ./.github/workflows/integration-per-language.yml
126+
with:
127+
language: "java"
128+
repo: "imiller31/simple-java-server"
129+
gradle:
130+
needs:
131+
- build-linux
132+
- build-windows
133+
uses: ./.github/workflows/integration-per-language.yml
134+
with:
135+
language: "gradle"
136+
repo: "imiller31/simple-gradle-server"
137+
swift:
138+
needs:
139+
- build-linux
140+
- build-windows
141+
uses: ./.github/workflows/integration-per-language.yml
142+
with:
143+
language: "swift"
144+
repo: "OliverMKing/swift-hello-world"
145+
erlang:
146+
needs:
147+
- build-linux
148+
- build-windows
149+
uses: ./.github/workflows/integration-per-language.yml
150+
with:
151+
language: "erlang"
152+
repo: "bfoley13/ErlangExample"
153+
clojure:
154+
needs:
155+
- build-linux
156+
- build-windows
157+
uses: ./.github/workflows/integration-per-language.yml
158+
with:
159+
language: "clojure"
160+
repo: "imiller31/clojure-simple-http"
161+
linux-integration-fail:
102162
name: Integration Test Summary
103-
needs: language-integration-test
104163
runs-on: ubuntu-latest
164+
needs:
165+
- gomodule
166+
- go
167+
- python
168+
- rust
169+
- javascript
170+
- ruby
171+
- csharp
172+
- java
173+
- gradle
174+
- swift
175+
- erlang
176+
- clojure
177+
if: ${{ cancelled() || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') }} # i cant believe this is necessary https://github.com/actions/runner/issues/2566
105178
steps:
106179
- run: |
107-
echo "Success"
180+
echo "Some workflows have failed!"
181+
exit 1

‎pkg/config/draftconfig_template_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var validVariableKinds = map[string]bool{
3939
"azureServiceConnection": true,
4040
"containerImageName": true,
4141
"containerImageVersion": true,
42+
"clusterResourceType": true,
4243
"dirPath": true,
4344
"dockerFileName": true,
4445
"envVarMap": true,

‎template/workflows/helm/draft.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,11 @@ variables:
9494
value: "false"
9595
description: "enable creation of target namespace if it does not exist"
9696
versions: ">=0.0.1"
97+
- name: "CLUSTERRESOURCETYPE"
98+
type: "string"
99+
kind: "clusterResourceType"
100+
default:
101+
disablePrompt: true
102+
value: "Microsoft.ContainerService/managedClusters"
103+
description: "ARM resource type for cluster"
104+
versions: ">=0.0.1"

‎template/workflows/kustomize/draft.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,11 @@ variables:
7878
value: "false"
7979
description: "enable creation of target namespace if it does not exist"
8080
versions: ">=0.0.1"
81+
- name: "CLUSTERRESOURCETYPE"
82+
type: "string"
83+
kind: "clusterResourceType"
84+
default:
85+
disablePrompt: true
86+
value: "Microsoft.ContainerService/managedClusters"
87+
description: "ARM resource type for cluster"
88+
versions: ">=0.0.1"

‎template/workflows/manifests/draft.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,11 @@ variables:
7878
value: "false"
7979
description: "enable creation of target namespace if it does not exist"
8080
versions: ">=0.0.1"
81+
- name: "CLUSTERRESOURCETYPE"
82+
type: "string"
83+
kind: "clusterResourceType"
84+
default:
85+
disablePrompt: true
86+
value: "Microsoft.ContainerService/managedClusters"
87+
description: "ARM resource type for cluster"
88+
versions: ">=0.0.1"

0 commit comments

Comments
 (0)