From f58f7cd7f36f2bbef7e58eb89f66fef9d985de1f Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 14 Jun 2023 14:49:43 -0700 Subject: [PATCH 1/6] Remove network policy tests from aks-engine, as they flake consistently --- test/apimodels/cniLinux1804.json | 2 +- test/apimodels/cniWindows1903.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json index 5d04f815bc..9dd202f8af 100644 --- a/test/apimodels/cniLinux1804.json +++ b/test/apimodels/cniLinux1804.json @@ -17,7 +17,7 @@ "addons": [ { "name": "azure-npm-daemonset", - "enabled": true, + "enabled": false, "containers": [ { "name": "azure-npm-daemonset", diff --git a/test/apimodels/cniWindows1903.json b/test/apimodels/cniWindows1903.json index 4c59b110ef..fddb947a94 100644 --- a/test/apimodels/cniWindows1903.json +++ b/test/apimodels/cniWindows1903.json @@ -18,7 +18,7 @@ "addons": [ { "name": "azure-npm-daemonset", - "enabled": true, + "enabled": false, "containers": [ { "name": "azure-npm-daemonset", From 74ef321e8b3bcafd9a263fda7f60679c761d54e9 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 14 Jun 2023 19:42:37 -0700 Subject: [PATCH 2/6] Remove npm addon from aks-enging templates --- test/apimodels/cniLinux1804.json | 14 +------------- test/apimodels/cniWindows1903.json | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json index 9dd202f8af..e2fa1a4548 100644 --- a/test/apimodels/cniLinux1804.json +++ b/test/apimodels/cniLinux1804.json @@ -13,19 +13,7 @@ "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": false, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] + } } }, "masterProfile": { diff --git a/test/apimodels/cniWindows1903.json b/test/apimodels/cniWindows1903.json index fddb947a94..cef320fbc4 100644 --- a/test/apimodels/cniWindows1903.json +++ b/test/apimodels/cniWindows1903.json @@ -14,19 +14,7 @@ "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": false, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] + } } }, "masterProfile": { From f952b31e821a500f59a93d4616400378ce0b855e Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Thu, 15 Jun 2023 11:45:01 -0700 Subject: [PATCH 3/6] Remove flaky network policy test in aks-engine --- .../aks-engine/e2e-step-template.yaml | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index 62b4a3b774..ddaac12c14 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -19,36 +19,17 @@ steps: 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.3.tar.gz - - # extract source - #tar -zxf $aksEVersion.tar.gz - tar -zxf v1.0.9.3.tar.gz - - # move source to current directory - mv aks-engine-*/* . # download binary - wget https://github.com/csfmomo/aks-engine/releases/download/v1.0.9.3/aks-engine-v1.0.9.3-linux-amd64.tar.gz + wget https://paujohnstorage.blob.core.windows.net/publicstorage/aks-engine-8187da5e1-linux-amd64.tar.gz rm -rf ./bin mkdir ./bin # extract binary - tar -zxvf aks-engine-v1.0.9.3-linux-amd64.tar.gz -C bin + tar -zxvf aks-engine-8187da5e1-linux-amd64.tar.gz -C bin mv ./bin/aks-engine-*/* ./bin/ + chmod 0777 ./bin/aks-engine ls -l ./bin ./bin/aks-engine version echo '##vso[task.prependpath]$(GOBIN)' From 00a7ba43ae6e68e7ef4b65888c6ce86528453184 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Thu, 15 Jun 2023 11:48:55 -0700 Subject: [PATCH 4/6] Add back in npm in template --- test/apimodels/cniLinux1804.json | 14 +++++++++++++- test/apimodels/cniWindows1903.json | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json index e2fa1a4548..5d04f815bc 100644 --- a/test/apimodels/cniLinux1804.json +++ b/test/apimodels/cniLinux1804.json @@ -13,7 +13,19 @@ "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": { diff --git a/test/apimodels/cniWindows1903.json b/test/apimodels/cniWindows1903.json index cef320fbc4..4c59b110ef 100644 --- a/test/apimodels/cniWindows1903.json +++ b/test/apimodels/cniWindows1903.json @@ -14,7 +14,19 @@ "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": { From bc75d10d950dee5678643fc5f8c3eda553eb2cd5 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Thu, 15 Jun 2023 12:56:38 -0700 Subject: [PATCH 5/6] Fixing Url, and making it easier to update this in the future --- .../aks-engine/e2e-step-template.yaml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index ddaac12c14..a6b79d9104 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -20,16 +20,27 @@ steps: cd '$(modulePath)' - # download binary - wget https://paujohnstorage.blob.core.windows.net/publicstorage/aks-engine-8187da5e1-linux-amd64.tar.gz + AKS_ENGINE_FORK=csfmomo + AKS_ENGINE_VERSION=v1.0.9.4 + + # Get source + wget https://github.com/$AKS_ENGINE_FORK/aks-engine/archive/$AKS_ENGINE_VERSION.tar.gz + + + # Extract source (to be able to run `make test-kubernetes` later on) + tar -zxf $AKS_ENGINE_VERSION.tar.gz + # move source to current directory + mv aks-engine-*/* . + + # Download aks-engine binary + wget https://github.com/$AKS_ENGINE_FORK/aks-engine/releases/download/$AKS_ENGINE_VERSION/aks-engine-$AKS_ENGINE_VERSION-linux-amd64.tar.gz rm -rf ./bin mkdir ./bin # extract binary - tar -zxvf aks-engine-8187da5e1-linux-amd64.tar.gz -C bin + tar -zxvf aks-engine-$AKS_ENGINE_VERSION-linux-amd64.tar.gz -C bin mv ./bin/aks-engine-*/* ./bin/ - chmod 0777 ./bin/aks-engine ls -l ./bin ./bin/aks-engine version echo '##vso[task.prependpath]$(GOBIN)' From 3234cc0eca8f9ed008b92eb2899282153539919b Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Thu, 15 Jun 2023 16:49:14 -0700 Subject: [PATCH 6/6] Upgrading to v.1.0.9.5 that skips illogical tests --- .pipelines/singletenancy/aks-engine/e2e-step-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml index a6b79d9104..c215e48747 100644 --- a/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-engine/e2e-step-template.yaml @@ -21,7 +21,7 @@ steps: cd '$(modulePath)' AKS_ENGINE_FORK=csfmomo - AKS_ENGINE_VERSION=v1.0.9.4 + AKS_ENGINE_VERSION=v1.0.9.5 # Get source wget https://github.com/$AKS_ENGINE_FORK/aks-engine/archive/$AKS_ENGINE_VERSION.tar.gz