From 0d6f47dd9c9b0939d849f107a32c1739c488f7c0 Mon Sep 17 00:00:00 2001 From: Max Jonas Werner Date: Tue, 28 Apr 2020 21:14:59 +0200 Subject: [PATCH 01/13] chore: add guidelines to PR template (#223) --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f38e7519..e0706df6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,14 @@ + + **What type of PR is this?** From b70c001d93bc08cfd3f527e8a1fadee9424cfda5 Mon Sep 17 00:00:00 2001 From: Gilbert Song <12464168+Gilbert88@users.noreply.github.com> Date: Tue, 28 Apr 2020 12:15:37 -0700 Subject: [PATCH 02/13] Bumped the Nvidia helm chart to 0.3.4 (#225) * Bumped the Nvidia helm chart to 0.3.4 To adopt the latest change on the Nvidia helm chart: https://github.com/mesosphere/charts/pull/550 * Added vaultRepo clusteraddon default value --- addons/nvidia/0.2.x/nvidia-5.yaml | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 addons/nvidia/0.2.x/nvidia-5.yaml diff --git a/addons/nvidia/0.2.x/nvidia-5.yaml b/addons/nvidia/0.2.x/nvidia-5.yaml new file mode 100644 index 00000000..b308f442 --- /dev/null +++ b/addons/nvidia/0.2.x/nvidia-5.yaml @@ -0,0 +1,69 @@ +--- +apiVersion: kubeaddons.mesosphere.io/v1beta1 +kind: ClusterAddon +metadata: + name: nvidia + namespace: kubeaddons + labels: + kubeaddons.mesosphere.io/name: nvidia + kubeaddons.mesosphere.io/provides: nvidia + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "0.2.0-5" + appversion.kubeaddons.mesosphere.io/nvidia: "0.2.0" + values.chart.helm.kubeaddons.mesosphere.io/nvidia: "https://raw.githubusercontent.com/mesosphere/charts/master/staging/nvidia/values.yaml" + helmv2.kubeaddons.mesosphere.io/upgrade-strategy: '[{"upgradeFrom": "<=0.4.0", "strategy": "delete"}]' +spec: + kubernetes: + minSupportedVersion: v1.15.6 + cloudProvider: + - name: aws + enabled: false + - name: azure + enabled: false + - name: docker + enabled: false + - name: none + enabled: false + chartReference: + chart: nvidia + repo: https://mesosphere.github.io/charts/staging + version: 0.3.4 + values: | + --- + grafana: + enabled: true + nvidia-dcgm-exporter: + enabled: true + nodeSelector: + konvoy.mesosphere.com/gpu-provider: NVIDIA + initContainers: + - name: init-wait + image: busybox + command: ['sh', '-c', 'sleep 200'] + nvidia-device-plugin: + enabled: true + resources: + limits: + cpu: 200m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + nodeSelector: + konvoy.mesosphere.com/gpu-provider: NVIDIA + initContainers: + - name: init-wait + image: busybox + command: ['sh', '-c', 'sleep 180'] + nvidia-driver: + enabled: true + image: + tag: "418.87.01-centos7" + resources: + requests: + cpu: 500m + memory: 512Mi + nodeSelector: + konvoy.mesosphere.com/gpu-provider: NVIDIA + vaultRepo: + enabled: true From d8782aa8cd8564785e3d141c43a34b5e84ccbd0a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 09:29:29 -0400 Subject: [PATCH 03/13] build(deps): bump k8s.io/helm in /test (#228) Bumps [k8s.io/helm](https://github.com/kubernetes/helm) from 2.16.5+incompatible to 2.16.6+incompatible. - [Release notes](https://github.com/kubernetes/helm/releases) - [Commits](https://github.com/kubernetes/helm/compare/v2.16.5...v2.16.6) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Shane Utt --- test/go.mod | 2 +- test/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/go.mod b/test/go.mod index 97734aff..621c7a7c 100644 --- a/test/go.mod +++ b/test/go.mod @@ -18,7 +18,7 @@ require ( google.golang.org/genproto v0.0.0-20190916214212-f660b8655731 // indirect k8s.io/api v0.17.4 k8s.io/apimachinery v0.17.4 - k8s.io/helm v2.16.5+incompatible + k8s.io/helm v2.16.6+incompatible k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect sigs.k8s.io/kind v0.7.0 ) diff --git a/test/go.sum b/test/go.sum index c2984d49..ff1720db 100644 --- a/test/go.sum +++ b/test/go.sum @@ -798,6 +798,8 @@ k8s.io/helm v2.16.3+incompatible h1:MGUcXcG1uAXWZmxu4vzzgRjZOnfFUsSJbHgqM+kyqzM= k8s.io/helm v2.16.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= k8s.io/helm v2.16.5+incompatible h1:uohDJ+QNrB5yIPyDqGTARkQNchtIgpLaVaV47NaNZus= k8s.io/helm v2.16.5+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= +k8s.io/helm v2.16.6+incompatible h1:aVg+KRb+ADYgRoX9fRw2FMbBndEjgq1KyxIv+uqYeoM= +k8s.io/helm v2.16.6+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= From 12610ad514e360368be9d6151dabb0b3e458bc05 Mon Sep 17 00:00:00 2001 From: Julian Gieseke Date: Thu, 30 Apr 2020 11:45:34 +0200 Subject: [PATCH 04/13] chore: bump chart 0.3.5 -> 0.3.11 --- addons/opsportal/1.1.x/opsportal.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/opsportal/1.1.x/opsportal.yaml b/addons/opsportal/1.1.x/opsportal.yaml index b1f86d1e..12e7eb65 100644 --- a/addons/opsportal/1.1.x/opsportal.yaml +++ b/addons/opsportal/1.1.x/opsportal.yaml @@ -7,7 +7,7 @@ metadata: labels: kubeaddons.mesosphere.io/name: opsportal annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-2" + catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-3" appversion.kubeaddons.mesosphere.io/opsportal: "1.1.0" endpoint.kubeaddons.mesosphere.io/opsportal: /ops/portal/ values.chart.helm.kubeaddons.mesosphere.io/opsportal: "https://raw.githubusercontent.com/mesosphere/charts/4155f480571eaf82c64ddd63d3d334b1105d0591/stable/opsportal/values.yaml" @@ -28,7 +28,7 @@ spec: chartReference: chart: opsportal repo: https://mesosphere.github.io/charts/stable - version: 0.3.5 + version: 0.3.11 values: | --- landing: From 476346453054a512e9332618fc4122f7af487851 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Mon, 4 May 2020 11:21:35 -0700 Subject: [PATCH 05/13] Exercise AWS tests only in Dispatch CI. (#230) * Exercise AWS tests only in Dispatch CI. * Update test/scripts/setup-konvoy.sh Co-Authored-By: Joe Julian * Address Review Comments. Co-authored-by: Joe Julian Co-authored-by: Shane Utt --- Dispatchfile | 16 +++++++++++++--- Makefile | 13 +++++++------ test/dispatch-ci.sh | 32 ++++++++++++++++++++++++++++++++ test/run-tests.sh | 22 ++++++++++++++++++++++ test/scripts/setup-konvoy.sh | 6 ++---- 5 files changed, 76 insertions(+), 13 deletions(-) create mode 100755 test/dispatch-ci.sh create mode 100755 test/run-tests.sh diff --git a/Dispatchfile b/Dispatchfile index a6170017..52424f4b 100644 --- a/Dispatchfile +++ b/Dispatchfile @@ -15,15 +15,25 @@ dindTask("dispatch-integration-test", image = "mesosphere/dispatch-dind:v0.5.2", workingDir="/workspace/src-git", args=["git", "fetch", "origin", "master"]), + v1.Container( name = "dispatch-integration-test", - image = "mesosphere/kubeaddons-ci:dispatch", - command = ["make","test"], + image = "mesosphere/kubeaddons-ci:dispatch@sha256:80a6f3c8775133b4ad2fab3d44ab4fbb4b541dbc03fcdb296b13f67611427d8c", + command = ["make","dispatch-test"], workingDir = "/workspace/src-git", env = [k8s.corev1.EnvVar(name = "DISPATCH_CI", value = "true"), + k8s.corev1.EnvVar(name = "AWS_REGION", value= "us-west-2"), + k8s.corev1.EnvVar(name = "AWS_ACCESS_KEY_ID", + valueFrom = secretVar("d2iq-dispatch-aws-creds", + "AWS_ACCESS_KEY_ID")), + k8s.corev1.EnvVar(name = "AWS_SECRET_ACCESS_KEY", + valueFrom = secretVar("d2iq-dispatch-aws-creds", + "AWS_SECRET_ACCESS_KEY")), k8s.corev1.EnvVar(name = "SSH_KEY_BASE64", valueFrom = secretVar("d2iq-dispatch-git-ssh-base64", - "ssh-privatekey-base64"))])]) + "ssh-privatekey-base64")) + ]) + ]) action(tasks = ["dispatch-integration-test"], on = pullRequest()) action(tasks = ["dispatch-integration-test"], on = pullRequest(chatops = ["test"])) diff --git a/Makefile b/Makefile index b29dcc4d..23596863 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,6 @@ export GIT_TERMINAL_PROMPT := 1 export ADDON_TESTS_SETUP_WAIT_DURATION := 30m export GOPRIVATE := github.com/mesosphere/kubeaddons - .DEFAULT_GOAL := test .PHONY: set-git-ssh @@ -15,9 +14,11 @@ ifdef DISPATCH_CI ./scripts/ci/setup_ssh.sh endif +# Target to run restricted set of tests on Dispatch CI. +.PHONY: dispatch-test +dispatch-test: set-git-ssh + ./test/dispatch-ci.sh + .PHONY: test -test: set-git-ssh - cd test && git fetch; \ - for g in $(shell cd test && go run scripts/test-wrapper.go); do \ - go test -timeout 30m -race -v -run $$g; \ - done +test: + ./test/run-tests.sh diff --git a/test/dispatch-ci.sh b/test/dispatch-ci.sh new file mode 100755 index 00000000..3950765a --- /dev/null +++ b/test/dispatch-ci.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# This script is exercised from Dispatch. + +set -euxo pipefail + +# Tests are exercised from `test` directory. The current directory of the script. +cd "$(dirname "$0")" + +echo "Setup Konvoy" +source ./scripts/setup-konvoy.sh v1.4.1 + +echo "git fetch branches." +git fetch + +echo "INFO: Exercise TestAwsGroup " +go test -tags experimental -timeout 60m -race -v -run TestAwsGroup + +# Fix kind cluster issues on Dispatch CI before enabling complete test-suite. + +# Once these issues are fixed. This target and the dispatch specific test script +# can be removed and make test can be exercised directly on dispatch. +# +# TODO: (D2IQ-66356) - Fix the kind cluster issues on dispatch +# +# echo "INFO: the following test groups will be run:" +# go run -tags experimental scripts/test-wrapper.go +# +# for g in $(go run -tags experimental scripts/test-wrapper.go) +# do +# go test -tags experimental -timeout 60m -race -v -run $g +# done diff --git a/test/run-tests.sh b/test/run-tests.sh new file mode 100755 index 00000000..3fd61db1 --- /dev/null +++ b/test/run-tests.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# This script is invoked by make test, and exercises integration tests. + +set -euxo pipefail + +# Tests are exercised from `test` directory. The current directory of the script. +cd "$(dirname "$0")" + +echo "Setup Konvoy" +source ./scripts/setup-konvoy.sh v1.4.1 + +echo "git fetch branches." +git fetch + +echo "INFO: the following test groups will be run:" +go run -tags experimental scripts/test-wrapper.go + +for g in $(go run -tags experimental scripts/test-wrapper.go) +do + go test -tags experimental -timeout 60m -race -v -run $g +done diff --git a/test/scripts/setup-konvoy.sh b/test/scripts/setup-konvoy.sh index 811a0a60..80c43e7d 100755 --- a/test/scripts/setup-konvoy.sh +++ b/test/scripts/setup-konvoy.sh @@ -1,5 +1,5 @@ #!/bin/bash -# NOTE: used by teamcity +# NOTE: used by teamcity and dispatch KONVOY_VERSION="v1.4.1" if ! [ -z $1 ] @@ -9,6 +9,4 @@ fi set -euo pipefail -wget -q https://downloads.mesosphere.io/konvoy/konvoy_${KONVOY_VERSION}_linux.tar.bz2 -O - | tar --extract -O -jf - konvoy_${KONVOY_VERSION}/konvoy > konvoy - -chmod +x konvoy +curl --silent https://downloads.mesosphere.io/konvoy/konvoy_${KONVOY_VERSION}_linux.tar.bz2 | tar xjv --strip=1 konvoy_${KONVOY_VERSION}/konvoy From c150ef718699e19bf19bee15b0199ca8b9b1a1a7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 May 2020 09:47:22 -0400 Subject: [PATCH 06/13] build(deps): bump github.com/mesosphere/kubeaddons in /test (#238) Bumps [github.com/mesosphere/kubeaddons](https://github.com/mesosphere/kubeaddons) from 0.13.0 to 0.14.1. - [Release notes](https://github.com/mesosphere/kubeaddons/releases) - [Commits](https://github.com/mesosphere/kubeaddons/compare/v0.13.0...v0.14.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- test/go.mod | 2 +- test/go.sum | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/test/go.mod b/test/go.mod index 621c7a7c..4c57c025 100644 --- a/test/go.mod +++ b/test/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/uuid v1.1.1 github.com/imdario/mergo v0.3.8 // indirect github.com/mesosphere/ksphere-testing-framework v0.0.0-20200415202108-3c10d515fc8b - github.com/mesosphere/kubeaddons v0.13.0 + github.com/mesosphere/kubeaddons v0.14.1 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect go.uber.org/zap v1.13.0 // indirect diff --git a/test/go.sum b/test/go.sum index ff1720db..b6653773 100644 --- a/test/go.sum +++ b/test/go.sum @@ -136,6 +136,7 @@ github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2H github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= @@ -226,6 +227,7 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -326,7 +328,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kudobuilder/kudo v0.10.1 h1:r/ibIChYMbEDSblWQ9tLyMIFiyBTnw6zfMpIkv+1V/w= github.com/kudobuilder/kudo v0.10.1/go.mod h1:jUkyWjVbgSPZBvYXALvOO5ydeIG+azsDnR2ZP1V8dQE= +github.com/kudobuilder/kudo v0.11.0/go.mod h1:990VBv0+bWl92ZJXVrdnmgwWStkZ4tD8kOYcskIsMbE= github.com/kudobuilder/kudo v0.11.1/go.mod h1:iBsOEGm11oNsVNAyhLSYfXGKI/vqyTl3z7k8T5twKqQ= +github.com/kudobuilder/kudo v0.12.0/go.mod h1:S6J9ds4CTmj6dQpfw8x2DlAKaNo9dWI2rplc3Q+4IU0= +github.com/kudobuilder/kuttl v0.1.0/go.mod h1:XH4r1WLh7rzZ4ECv9QIyxJm5AY8UqnsTZRz2RSarTRc= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= @@ -353,12 +358,16 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mesosphere/ksphere-testing-framework v0.0.0-20200320191913-4ed3ad40a337/go.mod h1:AEDOa+sY+rrGcsJ+G2IwNnYFaxg7dmfMW39qdl3C9IQ= +github.com/mesosphere/ksphere-testing-framework v0.0.0-20200409132906-872edbff4e7a/go.mod h1:0i/HsNkjOp9ic69XWXsuQtJjiJrx8Vwu7hFljyCcfHk= github.com/mesosphere/ksphere-testing-framework v0.0.0-20200415202108-3c10d515fc8b h1:szP6VK8LMSC9j69UliHIQ9VaPSDHzT0NqyWIzmzY39U= github.com/mesosphere/ksphere-testing-framework v0.0.0-20200415202108-3c10d515fc8b/go.mod h1:DnPqahep9Qq0pLYBgnKZoTAVzVQ+EksA0zYfEBCtvys= github.com/mesosphere/kubeaddons v0.10.2 h1:heURHF0srnA/UmNvgdMS+5+2Kh6rwMzEiapUGKy/24c= github.com/mesosphere/kubeaddons v0.10.2/go.mod h1:6TEL+jD4yW324GCF+aaIXNmBBgeeaF636DAi43OJffo= +github.com/mesosphere/kubeaddons v0.11.0/go.mod h1:vUibt0jKmrxwRi2nDS7Os+Lz1PMqGVDG6HpdI0HUWGQ= github.com/mesosphere/kubeaddons v0.13.0 h1:Dzmw3sc+kOHHHw5buC4DYw/efchsINvbuMH3zFcErIA= github.com/mesosphere/kubeaddons v0.13.0/go.mod h1:oRjEgw8tm9bozJZahB6NKFdbUTm1nehkIFqMJPk8rUw= +github.com/mesosphere/kubeaddons v0.14.1 h1:yPtDxF4Nir8SwxWPSOx3mVptwdJ06VjKfrSJoIfKQZ0= +github.com/mesosphere/kubeaddons v0.14.1/go.mod h1:xcvT9hS3koJF6vvSSgeTkr22T9B8oX4q1qQeT8Qsxo0= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -615,6 +624,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -742,6 +752,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= k8s.io/api v0.0.0-20191016110408-35e52d86657a h1:VVUE9xTCXP6KUPMf92cQmN88orz600ebexcRRaBTepQ= k8s.io/api v0.0.0-20191016110408-35e52d86657a/go.mod h1:/L5qH+AD540e7Cetbui1tuJeXdmNhO8jM6VkXeDdDhQ= +k8s.io/api v0.16.6/go.mod h1:naJcEPKsa3oqutLPPMxA2oLSqV4KxGDLU6IgkqHqgFE= k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= k8s.io/api v0.17.2/go.mod h1:BS9fjjLc4CMuqfSO8vgbHPKMt5+SF0ET6u/RVDihTo4= k8s.io/api v0.17.3 h1:XAm3PZp3wnEdzekNkcmj/9Y1zdmQYJ1I4GKSBBZ8aG0= @@ -760,6 +771,7 @@ k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8 h1:Iieh/ZEgT3BWwbLD5qEKcY06jKuPEl6zC7gPSehoLw4= k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ= k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ= +k8s.io/apimachinery v0.16.6/go.mod h1:mhhO3hoLkWO+2eCvqjPtH2Ly92l9nJDwsswzWKpkN2w= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.17.2 h1:hwDQQFbdRlpnnsR64Asdi55GyCaIP/3WQpMmbNBeWr4= k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= @@ -774,12 +786,14 @@ k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= k8s.io/apiserver v0.17.3/go.mod h1:iJtsPpu1ZpEnHaNawpSV0nYTGBhhX2dUlnn7/QS7QiY= k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5 h1:8ZfMjkMBzcXEawLsYHg9lDM7aLEVso3NiVKfUTnN56A= k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5/go.mod h1:sDl6WKSQkDM6zS1u9F49a0VooQ3ycYFBFLqd2jf2Xfo= +k8s.io/cli-runtime v0.16.6/go.mod h1:8N6G/UJmYvLXzpD1kjpuss6mFUeez+eg6Nu15VtBHvM= k8s.io/cli-runtime v0.17.3/go.mod h1:X7idckYphH4SZflgNpOOViSxetiMj6xI0viMAjM81TA= k8s.io/cli-runtime v0.17.4/go.mod h1:IVW4zrKKx/8gBgNNkhiUIc7nZbVVNhc1+HcQh+PiNHc= k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU= k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU= k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY= +k8s.io/code-generator v0.16.6/go.mod h1:2aiDuxDU7RQK2PVypXAXHo6+YwOlF33iezHQbSmKSA4= k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/code-generator v0.17.3/go.mod h1:l8BLVwASXQZTo2xamW5mQNFCe1XPiAesVq7Y1t7PiQQ= @@ -787,6 +801,7 @@ k8s.io/code-generator v0.17.4/go.mod h1:l8BLVwASXQZTo2xamW5mQNFCe1XPiAesVq7Y1t7P k8s.io/code-generator v0.18.0-alpha.1.0.20191220033320-6b257a9d6f46/go.mod h1:BjGKcoq1MRUmcssvHiSxodCco1T6nVIt4YeCT5CMSao= k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= k8s.io/component-base v0.0.0-20191016111319-039242c015a9/go.mod h1:SuWowIgd/dtU/m/iv8OD9eOxp3QZBBhTIiWMsBQvKjI= +k8s.io/component-base v0.16.6/go.mod h1:8+4lrSEgLQ9wqOzHVYx4GLSCU6sus8wqg8bfaTdXTwg= k8s.io/component-base v0.17.0/go.mod h1:rKuRAokNMY2nn2A6LP/MiwpoaMRHpfRnrPaUJJj1Yoc= k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs= k8s.io/component-base v0.17.3 h1:hQzTSshY14aLSR6WGIYvmw+w+u6V4d+iDR2iDGMrlUg= @@ -810,9 +825,11 @@ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLy k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51 h1:RBkTKVMF+xsNsSOVc0+HdC0B5gD1sr6s6Cu5w9qNbuQ= k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51/go.mod h1:gL826ZTIfD4vXTGlmzgTbliCAT9NGiqpCqK2aNYv5MQ= +k8s.io/kubectl v0.16.6/go.mod h1:ybKdxxoYuQLRqsmBFylvgyFPeVmmRYUbxk134JCiNoM= k8s.io/kubectl v0.17.3/go.mod h1:NUn4IBY7f7yCMwSop2HCXlw/MVYP4HJBiUmOR3n9w28= k8s.io/kubectl v0.17.4/go.mod h1:im5QWmh6fvtmJkkNm4HToLe8z9aM3jihYK5X/wOybcY= k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e/go.mod h1:ve7/vMWeY5lEBkZf6Bt5TTbGS3b8wAxwGbdXAsufjRs= +k8s.io/metrics v0.16.6/go.mod h1:de0nJbsn2wX/fapLW0Yi7k+GwXvEv4/g54agaDjzmQY= k8s.io/metrics v0.17.3/go.mod h1:HEJGy1fhHOjHggW9rMDBJBD3YuGroH3Y1pnIRw9FFaI= k8s.io/metrics v0.17.4/go.mod h1:6rylW2iD3M9VppnEAAtJASY1XS8Pt9tcYh+tHxBeV3I= k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= From b25e14b3efe716070f197f1865fb8a7583c4fee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20G=C3=B6gge?= Date: Thu, 7 May 2020 11:02:54 +0200 Subject: [PATCH 07/13] addons: add konvoysoaktests addon (#235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * addons: add konvoysoaktests addon * konvoysoaktests: update chart version Signed-off-by: Robin Gögge Co-authored-by: Hector Fernandez --- .../0.1.x/konvoysoaktests-1.yaml | 36 +++++++++++++++++++ metadata/root.yaml | 12 +++++++ metadata/static/konvoysoaktests/overview.md | 1 + 3 files changed, 49 insertions(+) create mode 100644 addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml create mode 100644 metadata/static/konvoysoaktests/overview.md diff --git a/addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml b/addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml new file mode 100644 index 00000000..15ad7aa7 --- /dev/null +++ b/addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml @@ -0,0 +1,36 @@ +--- + apiVersion: kubeaddons.mesosphere.io/v1beta1 + kind: Addon + metadata: + name: konvoysoaktests + namespace: kubeaddons + labels: + kubaddons.mesosphere.io/name: konvoysoaktests + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "0.1.1-1" + appversion.kubeaddons.mesosphere.io/konvoysoaktests: "v1.5.0-beta.2" + values.chart.helm.kubeaddons.mesosphere.io/konvoysoaktests: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/konvoysoaktests/values.yaml" + spec: + kubernetes: + minSupportedVersion: v1.15.6 + cloudProvider: + - name: aws + enabled: true + - name: azure + enabled: false + - name: gcp + enabled: false + - name: docker + enabled: false + - name: none + enabled: false + chartReference: + chart: konvoysoaktests + repo: https://mesosphere.github.io/charts/stable + version: 0.1.1 + values: | + --- + konvoysoakjob: + env: + PROVISIONER: "aws" + SOAK_TEST: "autoscaler" diff --git a/metadata/root.yaml b/metadata/root.yaml index cc20b17a..c8e5f447 100644 --- a/metadata/root.yaml +++ b/metadata/root.yaml @@ -239,6 +239,18 @@ konvoyconfig: title: Submit a Support Request link: https://d2iq.com/services-and-support --- +konvoysoaktests: + display_name: konvoysoaktests + description: konvoysoaktests + logo: konvoysoaktests/logo.svg + category: other + overview: konvoysoaktests/overview.md + resources: + links: + - type: support + title: Submit a Support Request + link: https://d2iq.com/services-and-support +--- kube-oidc-proxy: display_name: kube-oidc-proxy description: kube-oidc-proxy diff --git a/metadata/static/konvoysoaktests/overview.md b/metadata/static/konvoysoaktests/overview.md new file mode 100644 index 00000000..1333ed77 --- /dev/null +++ b/metadata/static/konvoysoaktests/overview.md @@ -0,0 +1 @@ +TODO From c2efac4de4b6761c9d854dcc834c0ac8a21dabcd Mon Sep 17 00:00:00 2001 From: Sebastian Brandt Date: Mon, 11 May 2020 19:53:48 +0200 Subject: [PATCH 08/13] chore: bump awsebscsiprovisioner (#244) * chore: prepare bump awsebscsiprovisioner [D2IQ-68177] [D2IQ-68177]: https://jira.d2iq.com/browse/D2IQ-68177 * chore: bump awsebscsiprovisioner - also enable resizer per default [D2IQ-68177] [D2IQ-68177]: https://jira.d2iq.com/browse/D2IQ-68177 --- .../0.5.x/awsebscsiprovisioner-3.yaml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 addons/awsebscsiprovisioner/0.5.x/awsebscsiprovisioner-3.yaml diff --git a/addons/awsebscsiprovisioner/0.5.x/awsebscsiprovisioner-3.yaml b/addons/awsebscsiprovisioner/0.5.x/awsebscsiprovisioner-3.yaml new file mode 100644 index 00000000..bd37992d --- /dev/null +++ b/addons/awsebscsiprovisioner/0.5.x/awsebscsiprovisioner-3.yaml @@ -0,0 +1,65 @@ +--- +apiVersion: kubeaddons.mesosphere.io/v1beta1 +kind: ClusterAddon +metadata: + name: awsebscsiprovisioner + labels: + kubeaddons.mesosphere.io/name: awsebscsiprovisioner + kubeaddons.mesosphere.io/provides: storageclass + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "0.5.0-3" + appversion.kubeaddons.mesosphere.io/awsebscsiprovisioner: "0.5.0" + values.chart.helm.kubeaddons.mesosphere.io/awsebscsiprovisioner: "https://raw.githubusercontent.com/mesosphere/charts/268df59/stable/awsebscsiprovisioner/values.yaml" +spec: + namespace: kube-system + requires: + - matchLabels: + kubeaddons.mesosphere.io/name: defaultstorageclass-protection + kubernetes: + minSupportedVersion: v1.15.6 + cloudProvider: + - name: aws + enabled: true + chartReference: + version: 0.3.7 + chart: awsebscsiprovisioner + repo: https://mesosphere.github.io/charts/stable + values: | + --- + resizer: + enabled: true + snapshotter: + enabled: true + provisioner: + enableVolumeScheduling: true + storageclass: + isDefault: true + reclaimPolicy: Delete + volumeBindingMode: WaitForFirstConsumer + type: gp2 + fstype: ext4 + iopsPerGB: null + encrypted: false + kmsKeyId: null + allowedTopologies: [] + # - matchLabelExpressions: + # - key: topology.ebs.csi.aws.com/zone + # values: + # - us-west-2a + # - us-west-2b + # - us-west-2c + allowVolumeExpansion: true + # replicas of the CSI-Controller + replicas: 1 + statefulSetCSIController: + # if you want to use kube2iam or kiam roles define it here as podAnnotation for the CSI-Controller (statefulSet) + podAnnotations: {} + statefulSetCSISnapshotController: + # if you want to use kube2iam or kiam roles define it here as podAnnotation for the CSI-Snapshot-Controller (statefulSet) + podAnnotations: {} + # Extra volume tags to attach to each dynamically provisioned volume. + # --- + # extraVolumeTags: + # key1: value1 + # key2: value2 + extraVolumeTags: {} From e7ce4766e4a6a0eae2eed925d4eed6799970075c Mon Sep 17 00:00:00 2001 From: Julian Gieseke Date: Tue, 12 May 2020 14:46:07 +0200 Subject: [PATCH 09/13] chore: bump opsportal chart 0.3.11 -> 0.3.12 (#246) * chore: bump opsportal chart 0.3.11 -> 0.3.12 * fix: update values.yaml for chart Co-authored-by: Sebastian Brandt --- addons/opsportal/1.1.x/opsportal.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/opsportal/1.1.x/opsportal.yaml b/addons/opsportal/1.1.x/opsportal.yaml index 12e7eb65..0cc99599 100644 --- a/addons/opsportal/1.1.x/opsportal.yaml +++ b/addons/opsportal/1.1.x/opsportal.yaml @@ -7,10 +7,10 @@ metadata: labels: kubeaddons.mesosphere.io/name: opsportal annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-3" + catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.0-4" appversion.kubeaddons.mesosphere.io/opsportal: "1.1.0" endpoint.kubeaddons.mesosphere.io/opsportal: /ops/portal/ - values.chart.helm.kubeaddons.mesosphere.io/opsportal: "https://raw.githubusercontent.com/mesosphere/charts/4155f480571eaf82c64ddd63d3d334b1105d0591/stable/opsportal/values.yaml" + values.chart.helm.kubeaddons.mesosphere.io/opsportal: "https://raw.githubusercontent.com/mesosphere/charts/8380038/stable/opsportal/values.yaml" spec: kubernetes: minSupportedVersion: v1.15.6 @@ -28,7 +28,7 @@ spec: chartReference: chart: opsportal repo: https://mesosphere.github.io/charts/stable - version: 0.3.11 + version: 0.3.12 values: | --- landing: From 010ae6baf6cc541f45a21373b18d41d1e5d34400 Mon Sep 17 00:00:00 2001 From: Jared Rodriguez Date: Tue, 12 May 2020 10:36:08 -0500 Subject: [PATCH 10/13] [DKA] Bump : D2IQ-67949 (#233) * chore(dka): adding revision * chore(dka): D2IQ-67949 --- .../1.1.x/dex-k8s-authenticator-7.yaml | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 addons/dex-k8s-authenticator/1.1.x/dex-k8s-authenticator-7.yaml diff --git a/addons/dex-k8s-authenticator/1.1.x/dex-k8s-authenticator-7.yaml b/addons/dex-k8s-authenticator/1.1.x/dex-k8s-authenticator-7.yaml new file mode 100644 index 00000000..13fa01fb --- /dev/null +++ b/addons/dex-k8s-authenticator/1.1.x/dex-k8s-authenticator-7.yaml @@ -0,0 +1,86 @@ +--- +apiVersion: kubeaddons.mesosphere.io/v1beta1 +kind: Addon +metadata: + name: dex-k8s-authenticator + namespace: kubeaddons + labels: + kubeaddons.mesosphere.io/name: dex-k8s-authenticator + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.2-1" + appversion.kubeaddons.mesosphere.io/dex-k8s-authenticator: "v1.1.2" + values.chart.helm.kubeaddons.mesosphere.io/dex-k8s-authenticator: "https://raw.githubusercontent.com/mesosphere/charts/f44c645c6bc843b254bb0f4f97d516f2cfee4707/staging/dex-k8s-authenticator/values.yaml" +spec: + kubernetes: + minSupportedVersion: v1.15.6 + cloudProvider: + - name: aws + enabled: true + - name: azure + enabled: true + - name: gcp + enabled: true + - name: docker + enabled: true + - name: none + enabled: true + requires: + - matchLabels: + kubeaddons.mesosphere.io/name: dex + - matchLabels: + kubeaddons.mesosphere.io/provides: ingresscontroller + chartReference: + chart: dex-k8s-authenticator + repo: https://mesosphere.github.io/charts/staging + version: 1.1.18 + values: | + --- + image: + repository: mesosphere/dex-k8s-authenticator + tag: v1.1.2-d2iq + ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: traefik + path: /token + hosts: + - "" + dexK8sAuthenticator: + #logoUrl: http:// + #tlsCert: /path/to/dex-client.crt + #tlsKey: /path/to/dex-client.key + pluginVersion: "v0.1.1" + clusters: + - name: kubernetes-cluster + short_description: "Kubernetes cluster" + description: "Kubernetes cluster authenticator" + # client_secret: value is generated automatically via initContainers + client_id: kube-apiserver + issuer: https://dex-kubeaddons.kubeaddons.svc.cluster.local:8080/dex + # This URI is just a placeholder and it will be replaced during initContainers + # with a URL pointing to the traefik ingress public load balancer. + redirect_uri: https://dex-k8s-authenticator-kubeaddons.kubeaddons.svc.cluster.local:5555/token/callback/kubernetes-cluster + resources: + requests: + cpu: 100m + memory: 128Mi + deploymentAnnotations: + # The certificate can change because it was rotated or different cluster + # DNS name has been set. + secret.reloader.stakater.com/reload: "traefik-kubeaddons-certificate" + configmap.reloader.stakater.com/reload: "dex-k8s-authenticator-kubeaddons" + initContainers: + - name: initialize-dka-config + image: mesosphere/kubeaddons-addon-initializer:v0.2.8 + args: ["dexK8sAuthenticator"] + env: + - name: "DKA_CONFIGMAP_NAME" + value: "dex-k8s-authenticator-kubeaddons" + - name: "DKA_NAMESPACE" + value: "kubeaddons" + - name: "DKA_INGRESS_NAMESPACE" + value: "kubeaddons" + - name: "DKA_INGRESS_SERVICE_NAME" + value: "traefik-kubeaddons" + - name: "DKA_WEB_PREFIX_PATH" + value: "/token" From 53e669823abd51170ae86341271106dbf159e14e Mon Sep 17 00:00:00 2001 From: Joe Julian Date: Tue, 12 May 2020 14:57:11 -0700 Subject: [PATCH 11/13] Revert "addons: add konvoysoaktests addon (#235)" (#247) This reverts commit b25e14b3efe716070f197f1865fb8a7583c4fee0. --- .../0.1.x/konvoysoaktests-1.yaml | 36 ------------------- metadata/root.yaml | 12 ------- metadata/static/konvoysoaktests/overview.md | 1 - 3 files changed, 49 deletions(-) delete mode 100644 addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml delete mode 100644 metadata/static/konvoysoaktests/overview.md diff --git a/addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml b/addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml deleted file mode 100644 index 15ad7aa7..00000000 --- a/addons/konvoysoaktests/0.1.x/konvoysoaktests-1.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- - apiVersion: kubeaddons.mesosphere.io/v1beta1 - kind: Addon - metadata: - name: konvoysoaktests - namespace: kubeaddons - labels: - kubaddons.mesosphere.io/name: konvoysoaktests - annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "0.1.1-1" - appversion.kubeaddons.mesosphere.io/konvoysoaktests: "v1.5.0-beta.2" - values.chart.helm.kubeaddons.mesosphere.io/konvoysoaktests: "https://raw.githubusercontent.com/mesosphere/charts/master/stable/konvoysoaktests/values.yaml" - spec: - kubernetes: - minSupportedVersion: v1.15.6 - cloudProvider: - - name: aws - enabled: true - - name: azure - enabled: false - - name: gcp - enabled: false - - name: docker - enabled: false - - name: none - enabled: false - chartReference: - chart: konvoysoaktests - repo: https://mesosphere.github.io/charts/stable - version: 0.1.1 - values: | - --- - konvoysoakjob: - env: - PROVISIONER: "aws" - SOAK_TEST: "autoscaler" diff --git a/metadata/root.yaml b/metadata/root.yaml index c8e5f447..cc20b17a 100644 --- a/metadata/root.yaml +++ b/metadata/root.yaml @@ -239,18 +239,6 @@ konvoyconfig: title: Submit a Support Request link: https://d2iq.com/services-and-support --- -konvoysoaktests: - display_name: konvoysoaktests - description: konvoysoaktests - logo: konvoysoaktests/logo.svg - category: other - overview: konvoysoaktests/overview.md - resources: - links: - - type: support - title: Submit a Support Request - link: https://d2iq.com/services-and-support ---- kube-oidc-proxy: display_name: kube-oidc-proxy description: kube-oidc-proxy diff --git a/metadata/static/konvoysoaktests/overview.md b/metadata/static/konvoysoaktests/overview.md deleted file mode 100644 index 1333ed77..00000000 --- a/metadata/static/konvoysoaktests/overview.md +++ /dev/null @@ -1 +0,0 @@ -TODO From c96f7b1319c1e04cdb5a71ce24135250aae1bea6 Mon Sep 17 00:00:00 2001 From: Branden Rolston Date: Thu, 14 May 2020 08:17:03 -0700 Subject: [PATCH 12/13] Deploy latest Kibana on GCP (#249) * Create kibana/6.8.x/kibana-3.yaml * Bump kibana addon revision * Add GCP cloud provider to kibana addon --- addons/kibana/6.8.x/kibana-3.yaml | 98 +++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 addons/kibana/6.8.x/kibana-3.yaml diff --git a/addons/kibana/6.8.x/kibana-3.yaml b/addons/kibana/6.8.x/kibana-3.yaml new file mode 100644 index 00000000..0f74b661 --- /dev/null +++ b/addons/kibana/6.8.x/kibana-3.yaml @@ -0,0 +1,98 @@ +--- +apiVersion: kubeaddons.mesosphere.io/v1beta1 +kind: Addon +metadata: + name: kibana + namespace: kubeaddons + labels: + kubeaddons.mesosphere.io/name: kibana + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "6.8.2-2" + appversion.kubeaddons.mesosphere.io/kibana: "6.8.2" + endpoint.kubeaddons.mesosphere.io/kibana: "/ops/portal/kibana" + docs.kubeaddons.mesosphere.io/kibana: "https://www.elastic.co/guide/en/kibana/6.8/index.html" + values.chart.helm.kubeaddons.mesosphere.io/kibana: "https://raw.githubusercontent.com/helm/charts/09004fa332094693e2e5fcffe474622ba15491ae/stable/kibana/values.yaml" +spec: + kubernetes: + minSupportedVersion: v1.15.6 + cloudProvider: + - name: aws + enabled: true + - name: azure + enabled: true + - name: gcp + enabled: true + - name: docker + enabled: false + - name: none + enabled: true + requires: + - matchLabels: + kubeaddons.mesosphere.io/name: elasticsearch + chartReference: + chart: stable/kibana + version: 3.2.5 + values: | + --- + image: + tag: "6.8.2" + files: + kibana.yml: + ## Default Kibana configuration from kibana-docker. + elasticsearch.url: http://elasticsearch-kubeaddons-client:9200 + ## Ref: https://www.elastic.co/guide/en/kibana/current/settings.html + server.basePath: /ops/portal/kibana + serviceAccount: + create: true + service: + type: ClusterIP + externalPort: 5601 + internalPort: 5601 + labels: + servicemonitor.kubeaddons.mesosphere.io/path: "prometheus__metrics" + resources: + # need more cpu upon initialization, therefore burstable class + limits: + cpu: 1000m + requests: + cpu: 100m + plugins: + # to avoid needing to download any plugins at runtime, use a container and a shared volume + # do not enable the plugins here, instead rebuild the mesosphere/kibana-plugins image with the new plugins + enabled: false + values: + - kibana-prometheus-exporter,6.8.2,https://github.com/pjhampton/kibana-prometheus-exporter/releases/download/6.8.2/kibana-prometheus-exporter-6.8.2.zip + extraContainers: | + - name: initialize-kibana-index + image: mesosphere/kubeaddons-addon-initializer:v0.1.5 + command: ["/bin/bash", "-c", "addon-initializer kibana && sleep infinity"] + env: + - name: "KIBANA_NAMESPACE" + value: "kubeaddons" + - name: "KIBANA_SERVICE_NAME" + value: "kibana-kubeaddons" + initContainers: + # from https://github.com/mesosphere/kubeaddons-sidecars + - name: kibana-plugins-install + image: mesosphere/kibana-plugins:v6.8.2 + command: ["/bin/sh", "-c", "cp -a /usr/share/kibana/plugins/. /usr/share/kibana/shared-plugins/"] + volumeMounts: + - name: plugins + mountPath: /usr/share/kibana/shared-plugins/ + extraVolumes: + - name: plugins + emptyDir: {} + extraVolumeMounts: + - mountPath: /usr/share/kibana/plugins/ + name: plugins + ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: traefik + traefik.frontend.rule.type: PathPrefixStrip + traefik.ingress.kubernetes.io/auth-response-headers: X-Forwarded-User,Authorization,Impersonate-User,Impersonate-Group + traefik.ingress.kubernetes.io/auth-type: forward + traefik.ingress.kubernetes.io/auth-url: http://traefik-forward-auth-kubeaddons.kubeaddons.svc.cluster.local:4181/ + traefik.ingress.kubernetes.io/priority: "2" + hosts: + - "/ops/portal/kibana" From b86541b078810a501937a55348ee19e724e7b74e Mon Sep 17 00:00:00 2001 From: Joe Julian Date: Thu, 28 May 2020 10:41:02 -0700 Subject: [PATCH 13/13] docs: add release notes for stable-1.8.0 --- RELEASE_NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 5b30bd95..b2e67402 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +## stable-1.15-1.8.0, stable-1.16-1.8.0 + +* \[kibana\]: Fixes an issue causing an outdated version of Kibana to be deployed to GCP. ([#249](https://github.com/mesosphere/kubernetes-base-addons/pull/249), [@branden](https://github.com/branden)) + # Release Notes ## stable-1.15-1.7.0, stable-1.16-1.7.0