diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 52c6c3d6cb7..0fbd29a6eb7 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -145,9 +145,6 @@ stages: displayName: Create artifact storage container condition: succeeded() - - publish: ./test/apimodels/ - artifact: clusterdefinitions - - stage: containerize displayName: Build Images dependsOn: diff --git a/.pipelines/singletenancy/aks-engine/e2e-dualstack-job-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-dualstack-job-template.yaml deleted file mode 100644 index 83c36d2cdfb..00000000000 --- a/.pipelines/singletenancy/aks-engine/e2e-dualstack-job-template.yaml +++ /dev/null @@ -1,154 +0,0 @@ -parameters: - name: "" - displayName: "" - pipelineBuildImage: "$(BUILD_IMAGE)" - clusterDefinition: "" - clusterDefinitionCniTypeKey: "" - clusterDefinitionCniBuildOS: "" - clusterDefinitionCniBuildExt: "" - -stages: - - stage: ${{ parameters.name }} - displayName: E2E - ${{ parameters.displayName }} - dependsOn: - - setup - - publish - jobs: - - job: Create_cluster - displayName: Create Dualstack cluster - timeoutInMinutes: 120 - pool: - name: $(BUILD_POOL_NAME_DEFAULT) - demands: - - agent.os -equals Linux - - Role -equals Build - container: - image: mcr.microsoft.com/oss/azcu/go-dev:$(GO_DEV_IMAGE_TAG) - variables: - GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path - GOBIN: "$(GOPATH)/bin" # Go binaries path - acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking" - CommitHash: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.CommitHash'] ] - StorageID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ] - cniVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ] - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: clusterdefinitions - targetPath: $(Pipeline.Workspace) - - bash: | - ls -lah - export CNI_URL=https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(StorageID)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-$(cniVersion)${{ parameters.clusterDefinitionCniBuildExt }} - export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} - echo CNI type is $CNI_TYPE - echo CNI_URL is $CNI_URL - echo Config: '${{ parameters.clusterDefinition }}' - cat '${{ parameters.clusterDefinition }}' - cat '${{ parameters.clusterDefinition }}' | jq --arg cnikey $CNI_TYPE --arg cniurl $CNI_URL '.properties.orchestratorProfile.kubernetesConfig[$cnikey]= $cniurl' > '${{ parameters.clusterDefinition }}'.tmp - cat '${{ parameters.clusterDefinition }}'.tmp | jq --arg ver $(cniVersion) '.properties.orchestratorProfile.kubernetesConfig.azureCNIVersion = $ver' > '${{ parameters.clusterDefinition }}' - mv '${{ parameters.clusterDefinition }}'.tmp '${{ parameters.clusterDefinition }}' - echo "Running E2E tests against a cluster built with the following API model:" - cp ${{ parameters.clusterDefinition }} clusterDefinition.json - displayName: "Configure AKS-Engine Cluster definition" - workingDirectory: $(Pipeline.Workspace) - - bash: | - echo Currently set AKS-Engine Version '$(AKS_ENGINE_VERSION)' - if [ -z '$(AKS_ENGINE_VERSION)' ] - then - echo Found set AKS-Engine version '$(AKS_ENGINE_VERSION)'... - export aksEVersion='$(AKS_ENGINE_VERSION)' - else - echo No AKS-Engine version set, using latest... - export aksEVersion=$(curl -L -s -H 'Accept: application/json' https://github.com/Azure/aks-engine/releases/latest | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/') - fi - echo Using AKS-Engine version $aksEVersion - - # download binary - #wget https://github.com/Azure/aks-engine/releases/download/$aksEVersion/aks-engine-$aksEVersion-linux-amd64.tar.gz - wget https://github.com/tamilmani1989/aks-engine/releases/download/v1.1.0/aks-engine-tamanoha-linux-amd64.tar.gz - rm -rf ./dualstack-ws - mkdir ./dualstack-ws - - #extract binary - #tar -zxvf aks-engine-$aksEVersion-linux-amd64.tar.gz -C dualstack-ws - tar -zxvf aks-engine-tamanoha-linux-amd64.tar.gz -C dualstack-ws - mv ./dualstack-ws/aks-engine-*/* ./dualstack-ws/ - ls -l ./dualstack-ws - ./dualstack-ws/aks-engine version - displayName: "Install aks-engine binary" - - - task: AzureCLI@1 - inputs: - azureSubscription: $(AKS_ENGINE_SERVICE_CONNECTION) - scriptLocation: "inlineScript" - addSpnToEnvironment: true - inlineScript: | - RG=kubernetes-dual-$(echo "${{ parameters.clusterDefinitionCniBuildOS }}-`date "+%Y-%m-%d-%S"`") - echo "##vso[task.setvariable variable=RESOURCE_GROUP;isOutput=true;]$RG" - region=$(echo $(AKS_ENGINE_REGION)|cut -d',' -f1) - echo "running: ./dualstack-ws/aks-engine deploy -m $(Pipeline.Workspace)/clusterDefinition.json --location $region -g $RG --subscription-id $(AKS_ENGINE_SUBSCRIPTION_ID) --client-id $servicePrincipalId --client-secret $servicePrincipalKey --output-directory ./dualstack-ws/kubeoutput" - ./dualstack-ws/aks-engine deploy -m $(Pipeline.Workspace)/clusterDefinition.json --location $region -g $RG --subscription-id $(AKS_ENGINE_SUBSCRIPTION_ID) --client-id $servicePrincipalId --client-secret $servicePrincipalKey --output-directory ./dualstack-ws/kubeoutput --auto-suffix - mv ./dualstack-ws/kubeoutput/kubeconfig/kubeconfig.* ./dualstack-ws/kubeoutput/kubeconfig/kubeconfig.json - name: DeployAKSEngine - displayName: "Deploy aks-engine cluster" - - publish: ./dualstack-ws/kubeoutput - artifact: kubeoutput-${{ parameters.clusterDefinitionCniBuildOS }} - - - job: Build_kubernetes - displayName: Build kubernetes upstream - timeoutInMinutes: 120 - pool: - name: $(BUILD_POOL_NAME_DEFAULT) - demands: - - agent.os -equals Linux - - Role -equals Build - steps: - - bash: | - git clone https://github.com/kubernetes/kubernetes.git - cd kubernetes - export PATH=$PATH:/usr/local/go/bin/ - make WHAT=test/e2e/e2e.test - displayName: 'Build Kubernetes e2e.test' - - publish: $(System.DefaultWorkingDirectory)/kubernetes/_output/local/bin/linux/amd64 - artifact: Test-${{ parameters.clusterDefinitionCniBuildOS }} - - - job: Run_test - displayName: Run upstream e2e test - dependsOn: [Create_cluster, Build_kubernetes] - timeoutInMinutes: 120 - pool: - name: $(BUILD_POOL_NAME_DEFAULT) - demands: - - agent.os -equals Linux - - Role -equals Build - variables: - RESOURCE_GROUP: $[ dependencies.Create_cluster.outputs['DeployAKSEngine.RESOURCE_GROUP'] ] - steps: - - checkout: none - - download: current - artifact: Test-${{ parameters.clusterDefinitionCniBuildOS }} - - download: current - artifact: kubeoutput-${{ parameters.clusterDefinitionCniBuildOS }} - - bash: | - echo "rgname is:$(RESOURCE_GROUP)" - chmod +x $(Pipeline.Workspace)/Test-${{ parameters.clusterDefinitionCniBuildOS }}/e2e.test - echo "os: ${{ parameters.clusterDefinitionCniBuildOS }}" - if [ "${{ parameters.clusterDefinitionCniBuildOS }}" == "windows" ]; then - echo "Skip LinuxOnly Tests" - $(Pipeline.Workspace)/Test-${{ parameters.clusterDefinitionCniBuildOS }}/e2e.test --provider=local --ginkgo.focus="Feature:IPv6DualStack" --ginkgo.skip="LinuxOnly" --kubeconfig=$(Pipeline.Workspace)/kubeoutput-${{ parameters.clusterDefinitionCniBuildOS }}/kubeconfig/kubeconfig.json - else - echo "Skip SCTP Tests" - $(Pipeline.Workspace)/Test-${{ parameters.clusterDefinitionCniBuildOS }}/e2e.test --provider=local --ginkgo.focus="Feature:IPv6DualStack" --ginkgo.skip="SCTP" --kubeconfig=$(Pipeline.Workspace)/kubeoutput-${{ parameters.clusterDefinitionCniBuildOS }}/kubeconfig/kubeconfig.json - fi - displayName: "Run Test Suite" - - task: AzureCLI@2 - displayName: "Delete Test Cluster Resource Group" - condition: always() - inputs: - azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION) - scriptType: 'bash' - scriptLocation: 'inlineScript' - inlineScript: | - echo "Deleting: $(RESOURCE_GROUP)" - az group delete -n $(RESOURCE_GROUP) --yes diff --git a/.pipelines/singletenancy/aks-engine/e2e-job-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-job-template.yaml deleted file mode 100644 index a5f670047c9..00000000000 --- a/.pipelines/singletenancy/aks-engine/e2e-job-template.yaml +++ /dev/null @@ -1,45 +0,0 @@ -parameters: - name: "" - displayName: "" - pipelineBuildImage: "$(BUILD_IMAGE)" - clusterDefinition: "" - clusterDefinitionCniTypeKey: "" - clusterDefinitionCniBuildOS: "" - clusterDefinitionCniBuildExt: "" - -stages: - - stage: ${{ parameters.name }} - displayName: E2E - ${{ parameters.displayName }} - dependsOn: - - setup - - publish - jobs: - - job: ${{ parameters.name }} - displayName: Singletenancy AKS Engine Suite - (${{ parameters.name }}) - timeoutInMinutes: 120 - pool: - name: $(BUILD_POOL_NAME_DEFAULT) - demands: - - agent.os -equals Linux - - Role -equals Build - container: - image: mcr.microsoft.com/oss/azcu/go-dev:$(GO_DEV_IMAGE_TAG) - variables: - GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path - GOBIN: "$(GOPATH)/bin" # Go binaries path - modulePath: "$(GOPATH)/src/github.com/Azure/aks-engine" - acnPath: "$(GOPATH)/src/github.com/Azure/azure-container-networking" - CommitHash: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.CommitHash'] ] - StorageID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ] - cniVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ] - npmVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.npmVersion'] ] - steps: - - template: e2e-step-template.yaml - parameters: - name: ${{ parameters.name }} - clusterDefinition: ${{ parameters.clusterDefinition }} - clusterDefinitionCniTypeKey: ${{ parameters.clusterDefinitionCniTypeKey }} - clusterDefinitionCniBuildOS: ${{ parameters.clusterDefinitionCniBuildOS }} - clusterDefinitionCniBuildExt: ${{ parameters.clusterDefinitionCniBuildExt }} - cniVersion: $(cniVersion) - npmVersion: $(npmVersion) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml deleted file mode 100644 index 3b69e1a4179..00000000000 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ /dev/null @@ -1,135 +0,0 @@ -parameters: - name: "" - clusterDefinition: "" - clusterDefinitionCniTypeKey: "" - clusterDefinitionCniBuildOS: "" - clusterDefinitionCniBuildExt: "" - cniVersion: "" - npmVersion: "" - -steps: - - checkout: none - - bash: | - go version - go env - mkdir -p '$(GOBIN)' - mkdir -p '$(GOPATH)/pkg' - mkdir -p '$(modulePath)' - go get github.com/onsi/ginkgo/ginkgo - go get github.com/onsi/gomega/... - - cd '$(modulePath)' - echo Currently set AKS-Engine Version '$(AKS_ENGINE_VERSION)' - if [ -z '$(AKS_ENGINE_VERSION)' ] - then - echo No AKS-Engine version set, using latest... - export aksEVersion=$(curl -L -s -H 'Accept: application/json' https://github.com/Azure/aks-engine/releases/latest | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/') - else - echo Found set AKS-Engine version '$(AKS_ENGINE_VERSION)'... - export aksEVersion='$(AKS_ENGINE_VERSION)' - fi - echo Using AKS-Engine version $aksEVersion - - #download source - wget https://github.com/csfmomo/aks-engine/archive/v1.0.9.1.tar.gz - - # extract source - #tar -zxf $aksEVersion.tar.gz - tar -zxf v1.0.9.1.tar.gz - - # move source to current directory - mv aks-engine-*/* . - - # download binary - wget https://github.com/csfmomo/aks-engine/releases/download/v1.0.9.1/aks-engine-v1.0.9.1-linux-amd64.tar.gz - - rm -rf ./bin - mkdir ./bin - - # extract binary - tar -zxvf aks-engine-v1.0.9.1-linux-amd64.tar.gz -C bin - mv ./bin/aks-engine-*/* ./bin/ - ls -l ./bin - ./bin/aks-engine version - echo '##vso[task.prependpath]$(GOBIN)' - echo '##vso[task.prependpath]$(GOROOT)/bin' - name: "GoEnv" - displayName: "Set up the Go environment" - - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: clusterdefinitions - targetPath: "$(modulePath)" - #buildType: 'current' # Options: current, specific - #project: # Required when buildType == Specific - - - bash: | - ls -lah - cd $(modulePath) - export CNI_URL=https://$(ARTIFACT_STORAGE).blob.core.windows.net/acn-$(StorageID)/azure-vnet-cni-${{ parameters.clusterDefinitionCniBuildOS }}-amd64-${{ parameters.cniVersion }}${{ parameters.clusterDefinitionCniBuildExt }} - export CNI_TYPE=${{ parameters.clusterDefinitionCniTypeKey }} - echo CNI type is $CNI_TYPE - echo CNI_URL is $CNI_URL - echo Config: '${{ parameters.clusterDefinition }}' - cat '${{ parameters.clusterDefinition }}' - cat '${{ parameters.clusterDefinition }}' | jq --arg cnikey $CNI_TYPE --arg cniurl $CNI_URL '.properties.orchestratorProfile.kubernetesConfig[$cnikey]= $cniurl' > '${{ parameters.clusterDefinition }}'.tmp - cat '${{ parameters.clusterDefinition }}'.tmp | jq --arg ver ${{ parameters.cniVersion }} '.properties.orchestratorProfile.kubernetesConfig.azureCNIVersion = $ver' > '${{ parameters.clusterDefinition }}' - cat '${{ parameters.clusterDefinition }}' | jq --arg ver $IMAGE_REGISTRY/azure-npm:${{ parameters.npmVersion }} '.properties.orchestratorProfile.kubernetesConfig.addons[0].containers[0].image = $ver' > '${{ parameters.clusterDefinition }}'.tmp - if [ "${{ parameters.Name }}" == "windows_20_22_e2e" ]; then - if [[ -z $(WS2022_IMG_SUBSCRIPTION) || -z $(WS2022_IMG_VERSION) ]]; then - echo WS2022 Gallery/Image Subscription and Version not set, using defaults in cniWindows2022.json - else - echo Using WS2022 Gallery/Image Subscription: $(WS2022_IMG_SUBSCRIPTION) and Version: $(WS2022_IMG_VERSION) - cat '${{ parameters.clusterDefinition }}'.tmp | jq --arg subscription $(WS2022_IMG_SUBSCRIPTION) '.properties.windowsProfile.imageReference.subscriptionId = $subscription' > '${{ parameters.clusterDefinition }}' - cat '${{ parameters.clusterDefinition }}' | jq --arg version $(WS2022_IMG_VERSION) '.properties.windowsProfile.imageReference.version = $version' > '${{ parameters.clusterDefinition }}'.tmp - fi - fi - mv '${{ parameters.clusterDefinition }}'.tmp '${{ parameters.clusterDefinition }}' - echo "Running E2E tests against a cluster built with the following API model:" - cp ${{ parameters.clusterDefinition }} clusterDefinition.json - displayName: Configure AKS-Engine - - - task: AzureCLI@1 - inputs: - azureSubscription: $(AKS_ENGINE_SERVICE_CONNECTION) - scriptLocation: "inlineScript" - addSpnToEnvironment: true - workingDirectory: "$(modulePath)" - inlineScript: | - export CLIENT_ID=$servicePrincipalId - export CLIENT_SECRET=$servicePrincipalKey - export PATH=$PATH:'$(GOPATH)' - export CLUSTER_DEFINITION=./clusterDefinition.json - export ORCHESTRATOR=kubernetes - export CREATE_VNET=false - export TIMEOUT=20m - export TENANT_ID=$(AKS_ENGINE_TENANT_ID) - export SUBSCRIPTION_ID=$(AKS_ENGINE_SUBSCRIPTION_ID) - export CLEANUP_ON_EXIT=true - export CLEANUP_IF_FAIL=false - export REGIONS=$(AKS_ENGINE_REGION) - export IS_JENKINS=false - export DEBUG_CRASHING_PODS=true - export AZURE_CORE_ONLY_SHOW_ERRORS=True - RGNAME="kubernetes"$RANDOM - export RESOURCE_GROUP=$RGNAME - echo "##vso[task.setvariable variable=RESOURCE_GROUP]$RESOURCE_GROUP" - echo Cluster Def $CLUSTER_DEFINITION - cat $CLUSTER_DEFINITION - make test-kubernetes - name: DeployAKSEngine - displayName: Run AKS-Engine E2E Tests - retryCountOnTaskFailure: 0 - - - task: CopyFiles@2 - inputs: - sourceFolder: "$(modulePath)/_output" - targetFolder: $(Build.ArtifactStagingDirectory)/${{ parameters.name }} - condition: always() - - - task: PublishBuildArtifacts@1 - inputs: - artifactName: ${{ parameters.name }} - pathtoPublish: "$(Build.ArtifactStagingDirectory)/${{ parameters.name }}" - condition: always() diff --git a/.pipelines/submodules-pipeline.yaml b/.pipelines/submodules-pipeline.yaml index 730c3772405..bc594ae20ec 100644 --- a/.pipelines/submodules-pipeline.yaml +++ b/.pipelines/submodules-pipeline.yaml @@ -83,7 +83,7 @@ stages: name: "$(BUILD_POOL_NAME_DEFAULT)" steps: - script: | - make all-binaries-platforms + make all-binaries-platforms name: "BuildAllPlatformBinaries" displayName: "Build all platform binaries" @@ -120,8 +120,6 @@ stages: displayName: Create artifact storage container condition: succeeded() - - publish: ./test/apimodels/ - artifact: clusterdefinitions - stage: containerize displayName: Build Images @@ -249,7 +247,7 @@ stages: pipelineBuildImage: "$(BUILD_IMAGE)" testDropgz: true clusterName: "submodules-ciliume2e" - + - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml parameters: name: "cilium_overlay_e2e" diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json deleted file mode 100644 index 5d04f815bc8..00000000000 --- a/test/apimodels/cniLinux1804.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "apiVersion": "vlabs", - "properties": { - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", - "orchestratorVersion": "1.22.15", - "kubernetesConfig": { - "networkPlugin": "azure", - "networkPolicy": "azure", - "azureCNIVersion": "", - "azureCNIURLLinux": "", - "apiServerConfig": { - "--tls-min-version": "VersionTLS12", - "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - }, - "addons": [ - { - "name": "azure-npm-daemonset", - "enabled": true, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] - } - }, - "masterProfile": { - "count": 1, - "dnsPrefix": "cniLinux", - "vmSize": "Standard_D2_v2" - }, - "agentPoolProfiles": [ - { - "name": "agentpool1", - "count": 3, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Linux", - "distro": "aks-ubuntu-18.04" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "", - "secret": "" - } - } -} diff --git a/test/apimodels/cniLinuxDualstack1804.json b/test/apimodels/cniLinuxDualstack1804.json deleted file mode 100644 index 3da81cc6446..00000000000 --- a/test/apimodels/cniLinuxDualstack1804.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "apiVersion": "vlabs", - "properties": { - "featureFlags": { - "enableIPv6DualStack": true - }, - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", - "orchestratorVersion": "1.22.2", - "kubernetesConfig": { - "loadBalancerSku": "Standard", - "excludeMasterFromStandardLB": true, - "clusterSubnet": "10.240.0.0/12,fc00::/48", - "serviceCidr": "10.0.0.0/16,fd00::/108", - "dnsServiceIP": "10.0.0.10", - "networkPlugin": "azure", - "networkMode": "transparent", - "azureCNIVersion": "", - "azureCNIURLLinux": "", - "apiServerConfig": { - "--feature-gates": "IPv6DualStack=true", - "--tls-min-version": "VersionTLS12", - "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - }, - "kubeletConfig": { - "--feature-gates": "IPv6DualStack=true" - }, - "controllerManagerConfig": { - "--feature-gates": "IPv6DualStack=true" - } - } - }, - "masterProfile": { - "count": 1, - "dnsPrefix": "duale2e", - "vmSize": "Standard_D2_v2" - }, - "agentPoolProfiles": [ - { - "name": "agentdualp1", - "count": 2, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Linux", - "distro": "aks-ubuntu-18.04" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData":"" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId":"", - "secret":"" - } - } -} diff --git a/test/apimodels/cniWindows1903.json b/test/apimodels/cniWindows1903.json deleted file mode 100644 index 4c59b110ef7..00000000000 --- a/test/apimodels/cniWindows1903.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "apiVersion": "vlabs", - "properties": { - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", - "orchestratorVersion": "1.22.15", - "kubernetesConfig": { - "networkPlugin": "azure", - "networkPolicy": "azure", - "containerRuntime": "containerd", - "azureCNIVersion": "", - "azureCNIURLWindows": "", - "apiServerConfig": { - "--tls-min-version": "VersionTLS12", - "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - }, - "addons": [ - { - "name": "azure-npm-daemonset", - "enabled": true, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] - } - }, - "masterProfile": { - "count": 1, - "dnsPrefix": "cniWindows", - "vmSize": "Standard_D2_v2" - }, - "agentPoolProfiles": [ - { - "name": "windowspool2", - "count": 2, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "VirtualMachineScaleSets", - "osType": "Windows" - } - ], - "windowsProfile": { - "adminUsername": "azureuser", - "adminPassword": "azureTest@!", - "enableAutomaticUpdates": true, - "sshEnabled": true, - "imageReference": { - "name": "containerVMImageDefinition", - "resourceGroup": "container-images-rg", - "subscriptionId": "d9eabe18-12f6-4421-934a-d7e2327585f5", - "gallery": "containerImageComputeGallery", - "version": "latest" - } - }, - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "", - "secret": "" - } - } -} diff --git a/test/apimodels/cniWindows2004.json b/test/apimodels/cniWindows2004.json deleted file mode 100644 index d3366a593ca..00000000000 --- a/test/apimodels/cniWindows2004.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "apiVersion": "vlabs", - "properties": { - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", - "orchestratorVersion": "1.22.15", - "kubernetesConfig": { - "networkPlugin": "azure", - "networkPolicy": "azure", - "azureCNIVersion": "", - "azureCNIURLWindows": "", - "apiServerConfig": { - "--tls-min-version": "VersionTLS12", - "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - }, - "addons": [{ - "name": "azure-npm-daemonset", - "enabled": true, - "containers": [{ - "name": "azure-npm-daemonset", - "image": "" - }] - }] - } - }, - "masterProfile": { - "count": 1, - "dnsPrefix": "cniWindows", - "vmSize": "Standard_D2_v2" - }, - "agentPoolProfiles": [{ - "name": "windowspool2", - "count": 2, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "VirtualMachineScaleSets", - "osType": "Windows" - }], - "windowsProfile": { - "adminUsername": "azureuser", - "adminPassword": "azureTest@!", - "enableAutomaticUpdates": true, - "sshEnabled": true, - "windowsPublisher": "MicrosoftWindowsServer", - "windowsOffer": "WindowsServer", - "windowsSku": "datacenter-core-2004-with-containers-smalldisk", - "imageVersion": "latest" - }, - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [{ - "keyData": "" - }] - } - }, - "servicePrincipalProfile": { - "clientId": "", - "secret": "" - } - } -} diff --git a/test/apimodels/cniWindows2022.json b/test/apimodels/cniWindows2022.json deleted file mode 100644 index d38fa229569..00000000000 --- a/test/apimodels/cniWindows2022.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "apiVersion": "vlabs", - "properties": { - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", - "orchestratorVersion": "1.22.15", - "kubernetesConfig": { - "networkPlugin": "azure", - "networkPolicy": "azure", - "containerRuntime": "containerd", - "windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.6.2/containerd-1.6.2-windows-amd64.tar.gz", - "apiServerConfig": { - "--tls-min-version": "VersionTLS12", - "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", - "--feature-gates": "WindowsHostProcessContainers=true" - }, - "kubeletConfig": { - "--feature-gates": "WindowsHostProcessContainers=true" - }, - "addons": [ - { - "name": "azure-npm-daemonset", - "enabled": true, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] - } - }, - "masterProfile": { - "count": 1, - "vmSize": "Standard_D2_v2" - }, - "agentPoolProfiles": [{ - "name": "windowspool2", - "count": 2, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "VirtualMachineScaleSets", - "osType": "Windows" - }], - "windowsProfile": { - "adminUsername": "azureuser", - "adminPassword": "azureTest@!", - "enableAutomaticUpdates": true, - "sshEnabled": false, - "windowsPauseImageURL": "mcr.microsoft.com/oss/kubernetes/pause:3.6", - "alwaysPullWindowsPauseImage": true, - "imageReference": { - "subscriptionId": "a15c116e-99e3-4c59-aebc-8f864929b4a0", - "resourceGroup": "akswinvhdbuilderrg", - "gallery": "AKSWindows", - "name": "windows-2022-containerd", - "version": "20348.643.220413" - } - }, - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [{ - "keyData": "" - }] - } - }, - "servicePrincipalProfile": { - "clientId": "", - "secret": "" - } - } -} diff --git a/test/apimodels/cniWindowsDualstack2004.json b/test/apimodels/cniWindowsDualstack2004.json deleted file mode 100644 index 9aaec6b11fa..00000000000 --- a/test/apimodels/cniWindowsDualstack2004.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "apiVersion": "vlabs", - "properties": { - "featureFlags": { - "enableIPv6DualStack": true - }, - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.22", - "orchestratorVersion": "1.22.2", - "kubernetesConfig": { - "loadBalancerSku": "Standard", - "excludeMasterFromStandardLB": true, - "clusterSubnet": "10.240.0.0/12,fc00::/48", - "serviceCidr": "10.0.0.0/16,fd00::/108", - "dnsServiceIP": "10.0.0.10", - "networkPlugin": "azure", - "apiServerConfig": { - "--feature-gates": "IPv6DualStack=true", - "--tls-min-version": "VersionTLS12", - "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - - }, - "kubeletConfig": { - "--feature-gates": "IPv6DualStack=true" - }, - "controllerManagerConfig": { - "--feature-gates": "IPv6DualStack=true" - } - } - }, - "masterProfile": { - "count": 1, - "dnsPrefix": "windual", - "vmSize": "Standard_D2_v2" - }, - "agentPoolProfiles": [ - { - "name": "cnidualwin", - "count": 3, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Windows" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData":"" - } - ] - } - }, - "windowsProfile": { - "adminUsername": "azureuser", - "adminPassword": "azureTest@!", - "enableAutomaticUpdates": true, - "windowsPublisher": "MicrosoftWindowsServer", - "windowsOffer": "WindowsServer", - "windowsSku": "Datacenter-Core-2004-with-Containers-smalldisk", - "imageVersion": "latest" - }, - "servicePrincipalProfile": { - "clientId":"", - "secret":"" - } - } -}