Skip to content

remove akse linux and pass ossku to cluster create #1658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 25, 2022
Merged

remove akse linux and pass ossku to cluster create #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f55ca9
remove akse linux and pass ossku to cluster create
aegal Oct 17, 2022
9f88d0c
Update .pipelines/singletenancy/aks-swift/e2e-step-template.yaml
aegal Oct 19, 2022
6613607
Update Makefile
aegal Oct 20, 2022
a3a3c05
Merge branch 'master' into alegal/passosku_replaceubuntuakse
aegal Oct 24, 2022
8d1958b
Merge branch 'master' into alegal/passosku_replaceubuntuakse
aegal Oct 25, 2022
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
25 changes: 2 additions & 23 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,11 @@ stages:
- template: singletenancy/aks-swift/e2e-job-template.yaml
parameters:
name: "aks_swift_e2e"
displayName: AKS Swift
displayName: AKS Swift Ubuntu
pipelineBuildImage: "$(BUILD_IMAGE)"
testDropgz: ""
clusterName: "swifte2e"

- template: singletenancy/aks-engine/e2e-job-template.yaml
parameters:
name: "ubuntu_18_04_linux_e2e"
displayName: Ubuntu 18.04
pipelineBuildImage: "$(BUILD_IMAGE)"
clusterDefinition: "cniLinux1804.json"
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
clusterDefinitionCniBuildOS: "linux"
clusterDefinitionCniBuildExt: ".tgz"
osSku: "Ubuntu"

- template: singletenancy/aks-engine/e2e-job-template.yaml
parameters:
Expand All @@ -320,25 +311,13 @@ stages:
clusterDefinitionCniBuildOS: "windows"
clusterDefinitionCniBuildExt: ".zip"

# - template: singletenancy/aks-engine/e2e-job-template.yaml
# parameters:
# name: "windows_20_22_e2e"
# displayName: "Windows 2022"
# pipelineBuildImage: "$(BUILD_IMAGE)"
# clusterDefinition: "cniWindows2022.json"
# clusterDefinitionCniTypeKey: "azureCNIURLWindows"
# clusterDefinitionCniBuildOS: "windows"
# clusterDefinitionCniBuildExt: ".zip"

- stage: cleanup
displayName: Cleanup
dependsOn:
- "aks_swift_e2e"
- "cilium_e2e"
- "ubuntu_18_04_linux_e2e"
- "windows_19_03_e2e"
- "windows_20_04_e2e"
# - "windows_20_22_e2e"
jobs:
- job: delete_remote_artifacts
displayName: Delete remote artifacts
Expand Down
3 changes: 2 additions & 1 deletion .pipelines/singletenancy/aks-swift/e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
pipelineBuildImage: "$(BUILD_IMAGE)"
testDropgz: ""
clusterName: ""

osSku: ""
stages:
- stage: ${{ parameters.name }}
displayName: E2E - ${{ parameters.displayName }}
Expand All @@ -30,3 +30,4 @@ stages:
name: ${{ parameters.name }}
testDropgz: ${{ parameters.testDropgz }}
clusterName: ${{ parameters.clusterName }}
osSku: ${{ parameters.osSku }}
3 changes: 2 additions & 1 deletion .pipelines/singletenancy/aks-swift/e2e-step-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ parameters:
name: ""
testDropgz: ""
clusterName: ""
osSku: ""

steps:
- bash: |
Expand Down Expand Up @@ -32,7 +33,7 @@ steps:
mkdir -p ~/.kube/
echo "Create AKS cluster"
make -C ./hack/swift azcfg AZCLI=az
make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(make revision)
make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-${{ parameters.osSku }}-$(make revision) OSSKU=${{ parameters.osSku }}
echo "Cluster successfully created"
displayName: Create test cluster
condition: succeeded()
Expand Down
2 changes: 2 additions & 0 deletions hack/swift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ AZCLI ?= docker run --rm -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v

# overrideable variables
USER ?= $(whoami)
OSSKU ?= Ubuntu
CLUSTER ?= $(USER)-$(REGION)
GROUP ?= $(CLUSTER)
REGION ?= centraluseuap
Expand Down Expand Up @@ -94,6 +95,7 @@ swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
--generate-ssh-keys \
--os-sku $(OSSKU) \
--yes
@$(MAKE) set-kubeconf

Expand Down