Skip to content
This repository was archived by the owner on Dec 16, 2021. It is now read-only.

Commit 05fcd28

Browse files
author
Andres Martinez Gotor
authored
Update minikube and base image (#33)
1 parent 942e6cf commit 05fcd28

File tree

4 files changed

+13
-33
lines changed

4 files changed

+13
-33
lines changed

.circleci/config.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ version: 2
33
## Definitions
44
defaults: &defaults
55
environment:
6-
KUBELESS_VERSION: v1.0.0-alpha.8
7-
MINIKUBE_VERSION: v0.25.2
6+
MINIKUBE_VERSION: v1.2.0
87
GOPATH: /home/circleci/.go_workspace
8+
machine:
9+
image: ubuntu-1604:201903-01
910
run_test: &run_test
1011
steps:
1112
- checkout
@@ -43,50 +44,38 @@ workflows:
4344
- incubator/vertx
4445
jobs:
4546
stable/ballerina:
46-
machine: true
4747
<<: *defaults
4848
<<: *run_test
4949
stable/dotnetcore:
50-
machine: true
5150
<<: *defaults
5251
<<: *run_test
5352
stable/golang:
54-
machine: true
5553
<<: *defaults
5654
<<: *run_test
5755
stable/java:
58-
machine: true
5956
<<: *defaults
6057
<<: *run_test
6158
stable/nodejs:
62-
machine: true
6359
<<: *defaults
6460
<<: *run_test
6561
stable/php:
66-
machine: true
6762
<<: *defaults
6863
<<: *run_test
6964
stable/python:
70-
machine: true
7165
<<: *defaults
7266
<<: *run_test
7367
stable/ruby:
74-
machine: true
7568
<<: *defaults
7669
<<: *run_test
7770
incubator/jvm:
78-
machine: true
7971
<<: *defaults
8072
<<: *run_test
8173
incubator/nodejs_distroless:
82-
machine: true
8374
<<: *defaults
8475
<<: *run_test
8576
incubator/nodejs_ce:
86-
machine: true
8777
<<: *defaults
8878
<<: *run_test
8979
incubator/vertx:
90-
machine: true
9180
<<: *defaults
9281
<<: *run_test

Makefile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ kubectl:
66
fi
77

88
kubeless:
9-
mkdir -p $$GOPATH/src/github.com/kubeless/; \
10-
cd $$GOPATH/src/github.com/kubeless/; \
11-
git clone https://github.com/kubeless/kubeless; \
12-
cd kubeless/; \
13-
make bootstrap; \
14-
export KUBECFG_JPATH=$$GOPATH/src/github.com/kubeless/kubeless/ksonnet-lib; \
15-
kubecfg show -J $$HOME/project -o yaml kubeless.jsonnet > kubeless.yaml; \
16-
make binary; \
17-
sudo mv $$GOPATH/bin/kubeless /usr/local/bin/
9+
export BUILD_NUM=`curl -s https://circleci.com/api/v1.1/project/github/kubeless/kubeless/tree/master\?limit\=20\&offset\=5\&filter\=completed | jq '.[] | select(.workflows.job_name == "build") | .build_num' | head -n 1`; \
10+
export KUBELESS_BIN_URL=`curl -s https://circleci.com/api/v1.1/project/github/kubeless/kubeless/$$BUILD_NUM/artifacts | jq -r '.[] | select(.path == "home/circleci/.go_workspace/bin/kubeless") | .url'`; \
11+
curl -LO $$KUBELESS_BIN_URL; \
12+
chmod +x kubeless; \
13+
sudo mv kubeless /usr/local/bin; \
14+
export KUBELESS_YML_URL=`curl -s https://circleci.com/api/v1.1/project/github/kubeless/kubeless/$$BUILD_NUM/artifacts | jq -r '.[] | select(.path == "home/circleci/.go_workspace/src/github.com/kubeless/kubeless/build-manifests/kubeless.yaml") | .url'`; \
15+
curl -LO $$KUBELESS_YML_URL
1816

1917
bootstrap: kubectl kubeless
20-
18+
2119
test:
2220
./script/integration-tests

script/cluster-up-minikube.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ MINIKUBE_BIN=$(which minikube)
5757

5858
# Start minikube
5959
sudo -E ${MINIKUBE_BIN} start --vm-driver=none \
60-
--extra-config=apiserver.Authorization.Mode=RBAC \
60+
--extra-config=kubelet.cgroup-driver=cgroupfs \
6161
--memory 4096
6262

6363
# Wait til settles

script/integration-tests.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ target=${1:?}
1919

2020
ROOT_DIR=`cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null && pwd`
2121

22-
# Check for some needed tools, install (some) if missing
23-
which bats > /dev/null || {
24-
echo "ERROR: 'bats' is required to run these tests," \
25-
"install it from https://github.com/sstephenson/bats"
26-
exit 255
27-
}
28-
2922
# Start a k8s cluster (minikube, dind) if not running
3023
kubectl get nodes || {
3124
cluster_up=./script/cluster-up-minikube.sh
@@ -38,7 +31,7 @@ kubectl get clusterrolebinding kube-dns-admin >& /dev/null || \
3831
kubectl create clusterrolebinding kube-dns-admin --serviceaccount=kube-system:default --clusterrole=cluster-admin
3932

4033
kubectl create namespace kubeless
41-
kubectl create -f ${GOPATH}/src/github.com/kubeless/kubeless/kubeless.yaml
34+
kubectl create -f ${ROOT_DIR}/kubeless.yaml
4235
kubectl rollout status -n kubeless deployment/kubeless-controller-manager
4336

4437
make -C ${ROOT_DIR}/${target} deploy

0 commit comments

Comments
 (0)