Skip to content

Commit

Permalink
Enable builds for GKE 1.15 (#1606)
Browse files Browse the repository at this point in the history
* Enable builds for GKE 1.15

* Update kind

* Fix URL, use Helm3

* Fix typo in commands

* Update Helm 2. Pin mongodb requirement

* Change tiller version. Push images

* Remove debug changes
  • Loading branch information
Andres Martinez Gotor authored Mar 26, 2020
1 parent 78cb6cd commit eb0fe0e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 23 deletions.
48 changes: 26 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ workflows:
- test_dashboard
- build_go_images
- build_dashboard
- GKE_1_13_MASTER:
- GKE_1_15_MASTER:
<<: *build_on_master
requires:
- test_go
- test_dashboard
- build_go_images
- build_dashboard
- GKE_1_13_LATEST_RELEASE:
- GKE_1_15_LATEST_RELEASE:
<<: *build_on_master
requires:
- test_go
Expand Down Expand Up @@ -98,8 +98,8 @@ workflows:
- local_e2e_tests_postgresql_helm3
- local_e2e_tests_mongodb_helm2
- local_e2e_tests_mongodb_helm3
- GKE_1_13_MASTER
- GKE_1_13_LATEST_RELEASE
- GKE_1_15_MASTER
- GKE_1_15_LATEST_RELEASE
- GKE_1_14_MASTER
- GKE_1_14_LATEST_RELEASE
- push_images:
Expand All @@ -109,8 +109,8 @@ workflows:
- local_e2e_tests_postgresql_helm3
- local_e2e_tests_mongodb_helm2
- local_e2e_tests_mongodb_helm3
- GKE_1_13_MASTER
- GKE_1_13_LATEST_RELEASE
- GKE_1_15_MASTER
- GKE_1_15_LATEST_RELEASE
- GKE_1_14_MASTER
- GKE_1_14_LATEST_RELEASE
- release:
Expand All @@ -120,8 +120,8 @@ workflows:
- local_e2e_tests_postgresql_helm3
- local_e2e_tests_mongodb_helm2
- local_e2e_tests_mongodb_helm3
- GKE_1_13_MASTER
- GKE_1_13_LATEST_RELEASE
- GKE_1_15_MASTER
- GKE_1_15_LATEST_RELEASE
- GKE_1_14_MASTER
- GKE_1_14_LATEST_RELEASE

Expand Down Expand Up @@ -175,7 +175,7 @@ build_images: &build_images
- "*"
install_kubectl: &install_kubectl
run: |
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/amd64/kubectl
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl
chmod +x ./kubectl
sudo mv ./kubectl /usr/local/bin/kubectl
run_e2e_tests: &run_e2e_tests
Expand Down Expand Up @@ -245,9 +245,9 @@ local_e2e_steps: &local_e2e_steps
- <<: *exports
# Install kind
- run: |
curl -LO https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64
chmod +x kind-linux-amd64
sudo mv kind-linux-amd64 /usr/local/bin/kind
curl -LO https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-Linux-amd64
chmod +x kind-Linux-amd64
sudo mv kind-Linux-amd64 /usr/local/bin/kind
- run: kind create cluster
- run: echo "export KUBECONFIG=$(kind get kubeconfig-path --name=kind)" >> $BASH_ENV
- <<: *install_kubectl
Expand Down Expand Up @@ -315,12 +315,12 @@ jobs:
machine: true
environment:
KUBEAPPS_DB: "mongodb"
HELM_VERSION: "v2.14.0"
HELM_VERSION: "v2.16.3"
<<: *local_e2e_steps
local_e2e_tests_postgresql_helm2:
machine: true
environment:
HELM_VERSION: "v2.14.0"
HELM_VERSION: "v2.16.3"
KUBEAPPS_DB: "postgresql"
<<: *local_e2e_steps
local_e2e_tests_mongodb_helm3:
Expand All @@ -335,27 +335,31 @@ jobs:
HELM_VERSION: "v3.0.2"
KUBEAPPS_DB: "postgresql"
<<: *local_e2e_steps
GKE_1_13_MASTER:
GKE_1_15_MASTER:
<<: *gke_test
environment:
HELM_VERSION: "v2.14.0"
GKE_BRANCH: "1.13"
GKE_1_13_LATEST_RELEASE:
HELM_VERSION: "v3.0.2"
GKE_BRANCH: "1.15"
KUBEAPPS_DB: "postgresql"
GKE_1_15_LATEST_RELEASE:
<<: *gke_test
environment:
HELM_VERSION: "v2.14.0"
GKE_BRANCH: "1.13"
HELM_VERSION: "v3.0.2"
GKE_BRANCH: "1.15"
KUBEAPPS_DB: "postgresql"
TEST_LATEST_RELEASE: 1
GKE_1_14_MASTER:
<<: *gke_test
environment:
HELM_VERSION: "v2.14.0"
HELM_VERSION: "v3.0.2"
GKE_BRANCH: "1.14"
KUBEAPPS_DB: "postgresql"
GKE_1_14_LATEST_RELEASE:
<<: *gke_test
environment:
HELM_VERSION: "v2.14.0"
HELM_VERSION: "v3.0.2"
GKE_BRANCH: "1.14"
KUBEAPPS_DB: "postgresql"
TEST_LATEST_RELEASE: 1
sync_chart:
docker:
Expand Down
3 changes: 2 additions & 1 deletion chart/kubeapps/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
dependencies:
- name: mongodb
version: ">= 0"
# Versions above 7.8 (<7.10.2) contains an error
version: "7.8.10"
repository: https://charts.bitnami.com/bitnami
condition: mongodb.enabled
- name: postgresql
Expand Down

0 comments on commit eb0fe0e

Please sign in to comment.