Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
add support for k8s v1.12.0-alpha.1 (#3604)
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.circleci/config.yml
  • Loading branch information
@jackfrancis
jackfrancis committed Aug 3, 2018
1 parent e65bac7 commit c249ab2
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 161 deletions.
193 changes: 32 additions & 161 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,38 +81,14 @@ jobs:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
swarmmode-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export PATH=$GOPATH/bin:$PATH' >> $BASH_ENV
echo 'export BUILD_NUM=${CIRCLE_BUILD_NUM}' >> $BASH_ENV
echo 'export RESOURCE_GROUP_PREFIX=y' >> $BASH_ENV
echo 'export SKIP_METRICS=y' >> $BASH_ENV
echo 'export STAGE_TIMEOUT_MIN=30' >> $BASH_ENV
echo 'export NUM_OF_RETRIES=2' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_PR_E2E}' >> $BASH_ENV
echo 'export SERVICE_PRINCIPAL_CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_PR_E2E_2}' >> $BASH_ENV
echo 'export SERVICE_PRINCIPAL_CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET_PR_E2E_2}' >> $BASH_ENV
echo 'export CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID=${CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID_2}' >> $BASH_ENV
echo 'export CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET=${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET_2}' >> $BASH_ENV
echo 'export TEST_CONFIG=test/e2e/swarmmode-deployments.json' >> $BASH_ENV
- run:
name: Swarm Mode feature validation tests
command: make bootstrap build test-e2e
no_output_timeout: "30m"
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_logs
k8s-1.7-release-e2e:
k8s-linux-default-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export TIMEOUT=20m' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.7' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
echo 'export CREATE_VNET=true' >> $BASH_ENV
echo 'export TIMEOUT=10m' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/kubernetes.json' >> $BASH_ENV
echo 'export CREATE_VNET=false' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
Expand All @@ -129,15 +105,17 @@ jobs:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
k8s-linux-default-e2e:
k8s-1.9-release-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export TIMEOUT=10m' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/kubernetes.json' >> $BASH_ENV
echo 'export CREATE_VNET=false' >> $BASH_ENV
echo 'export TIMEOUT=20m' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.9' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
echo 'export CREATE_VNET=true' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
echo 'export CLEANUP_IF_FAIL=false' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_E2E_KUBERNETES}' >> $BASH_ENV
Expand All @@ -153,21 +131,23 @@ jobs:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
k8s-1.9-release-e2e:
k8s-1.10-release-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export TIMEOUT=20m' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.9' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.10' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
echo 'export CREATE_VNET=true' >> $BASH_ENV
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
echo 'export CLEANUP_IF_FAIL=false' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_OBJECTID=${SERVICE_PRINCIPAL_OBJECT_ID_E2E_KUBERNETES}' >> $BASH_ENV
- run:
name: compile
command: make build-binary
Expand All @@ -179,18 +159,17 @@ jobs:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
k8s-1.10-release-e2e:
k8s-1.11-release-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export TIMEOUT=20m' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.10' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.11' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
echo 'export CREATE_VNET=true' >> $BASH_ENV
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
echo 'export CLEANUP_IF_FAIL=false' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_E2E_KUBERNETES}' >> $BASH_ENV
Expand All @@ -207,13 +186,13 @@ jobs:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
k8s-1.11-release-e2e:
k8s-1.12-release-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export TIMEOUT=20m' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.11' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.12' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
echo 'export CREATE_VNET=true' >> $BASH_ENV
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
Expand Down Expand Up @@ -332,54 +311,14 @@ jobs:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
openshift-3.9-rhel-e2e:
working_directory: /go/src/github.com/Azure/acs-engine
docker:
- image: registry.svc.ci.openshift.org/azure/acs-engine-tests:v3.9
environment:
GOPATH: /go
steps:
- checkout
- run: |
echo 'export TIMEOUT=30m' >> $BASH_ENV
echo 'export DISTRO=openshift39_rhel' >> $BASH_ENV
echo 'export LOCATION=eastus' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=3.9' >> $BASH_ENV
echo 'export ORCHESTRATOR_VERSION=3.9.0' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/openshift.json' >> $BASH_ENV
echo 'export CREATE_VNET=false' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET_E2E_KUBERNETES}' >> $BASH_ENV
- run:
name: compile
command: make build-binary
- run:
name: ginkgo openshift e2e tests
command: make test-openshift
no_output_timeout: "30m"
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
openshift-3.9-rhel-e2e-vnet:
working_directory: /go/src/github.com/Azure/acs-engine
docker:
- image: registry.svc.ci.openshift.org/azure/acs-engine-tests:v3.9
environment:
GOPATH: /go
k8s-windows-1.12-release-e2e:
<<: *defaults
steps:
- checkout
- run: |
echo 'export TIMEOUT=30m' >> $BASH_ENV
echo 'export DISTRO=openshift39_rhel' >> $BASH_ENV
echo 'export LOCATION=eastus' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=3.9' >> $BASH_ENV
echo 'export ORCHESTRATOR_VERSION=3.9.0' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/openshift/definition.json' >> $BASH_ENV
echo 'export CREATE_VNET=true' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=1.12' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/windows/definition.json' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
Expand All @@ -389,40 +328,8 @@ jobs:
name: compile
command: make build-binary
- run:
name: ginkgo openshift e2e tests
command: make test-openshift
no_output_timeout: "30m"
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_logs
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_output
openshift-3.9-centos-e2e:
working_directory: /go/src/github.com/Azure/acs-engine
docker:
- image: registry.svc.ci.openshift.org/azure/acs-engine-tests:v3.9
environment:
GOPATH: /go
steps:
- checkout
- run: |
echo 'export TIMEOUT=30m' >> $BASH_ENV
echo 'export DISTRO=openshift39_centos' >> $BASH_ENV
echo 'export LOCATION=eastus' >> $BASH_ENV
echo 'export ORCHESTRATOR_RELEASE=3.9' >> $BASH_ENV
echo 'export ORCHESTRATOR_VERSION=3.9.0' >> $BASH_ENV
echo 'export CLUSTER_DEFINITION=examples/openshift.json' >> $BASH_ENV
echo 'export CREATE_VNET=false' >> $BASH_ENV
echo 'export CLEANUP_ON_EXIT=false' >> $BASH_ENV
echo 'export RETAIN_SSH=false' >> $BASH_ENV
echo 'export SUBSCRIPTION_ID=${SUBSCRIPTION_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID_E2E_KUBERNETES}' >> $BASH_ENV
echo 'export CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET_E2E_KUBERNETES}' >> $BASH_ENV
- run:
name: compile
command: make build-binary
- run:
name: ginkgo openshift e2e tests
command: make test-openshift
name: ginkgo k8s windows e2e tests
command: make test-kubernetes
no_output_timeout: "30m"
- store_artifacts:
path: /go/src/github.com/Azure/acs-engine/_logs
Expand All @@ -449,12 +356,6 @@ workflows:
filters:
branches:
ignore: master
- k8s-1.7-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- k8s-1.8-release-e2e:
requires:
- pr-e2e-hold
Expand All @@ -479,49 +380,31 @@ workflows:
filters:
branches:
ignore: master
- k8s-1.9-release-e2e:
- k8s-windows-1.12-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- k8s-1.10-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- k8s-1.11-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- openshift-3.9-rhel-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- openshift-3.9-rhel-e2e-vnet:
- k8s-1.9-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- openshift-3.9-centos-e2e:
- k8s-1.10-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- swarm-e2e:
- k8s-1.11-release-e2e:
requires:
- pr-e2e-hold
filters:
branches:
ignore: master
- swarmmode-e2e:
- k8s-1.12-release-e2e:
requires:
- pr-e2e-hold
filters:
Expand All @@ -539,12 +422,6 @@ workflows:
filters:
branches:
only: master
- k8s-1.7-release-e2e:
requires:
- test
filters:
branches:
only: master
- k8s-1.8-release-e2e:
requires:
- test
Expand Down Expand Up @@ -581,25 +458,19 @@ workflows:
filters:
branches:
only: master
- k8s-windows-1.11-release-e2e:
requires:
- test
filters:
branches:
only: master
- openshift-3.9-rhel-e2e:
- k8s-1.12-release-e2e:
requires:
- test
filters:
branches:
only: master
- openshift-3.9-rhel-e2e-vnet:
- k8s-windows-1.11-release-e2e:
requires:
- test
filters:
branches:
only: master
- openshift-3.9-centos-e2e:
- k8s-windows-1.12-release-e2e:
requires:
- test
filters:
Expand Down
7 changes: 7 additions & 0 deletions pkg/acsengine/defaults-kubelet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ func setKubeletConfig(cs *api.ContainerService) {
}
}

// Get rid of values not supported in v1.12 and up
if common.IsKubernetesVersionGe(o.OrchestratorVersion, "1.12.0-alpha.1") {
for _, key := range []string{"--cadvisor-port"} {
delete(o.KubernetesConfig.KubeletConfig, key)
}
}

// Remove secure kubelet flags, if configured
if !helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableSecureKubelet) {
for _, key := range []string{"--anonymous-auth", "--client-ca-file"} {
Expand Down
Loading

0 comments on commit c249ab2

Please sign in to comment.