From 3064373f4bcdc01d4bbf73e31074195dee38d84b Mon Sep 17 00:00:00 2001 From: Gurminder Sunner Date: Mon, 13 Jan 2020 14:16:55 +0000 Subject: [PATCH 1/3] operator build test --- operator/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/operator/README.md b/operator/README.md index a0e388b06e..a9d77d56cc 100644 --- a/operator/README.md +++ b/operator/README.md @@ -79,4 +79,5 @@ You should delete the Operator running in the cluster at this point. # Build Helm Chart -Use the Makefile in the `./helm` directory. Ensure you have `pyyaml` in your python environment. \ No newline at end of file +Use the Makefile in the `./helm` directory. Ensure you have `pyyaml` in your python environment. + From 4e82576f2836ccc0071aefceec43ba0074600796 Mon Sep 17 00:00:00 2001 From: Gurminder Sunner Date: Tue, 14 Jan 2020 13:14:07 +0000 Subject: [PATCH 2/3] Create and use seldonio/core-builder:0.10 --- core-builder/Dockerfile | 4 ++-- core-builder/Makefile | 2 +- jenkins-x-integration.yml | 2 +- jenkins-x-lint.yml | 2 +- jenkins-x.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core-builder/Dockerfile b/core-builder/Dockerfile index 87c54fc153..018090f439 100644 --- a/core-builder/Dockerfile +++ b/core-builder/Dockerfile @@ -90,8 +90,8 @@ RUN apt-get remove -y --auto-remove && apt-get clean -y && rm -rf /var/lib/apt/l # INSTALL GO ENV PATH /usr/local/go/bin:$PATH -RUN wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz && \ - tar -zxvf go1.13.3.linux-amd64.tar.gz && \ +RUN wget https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz && \ + tar -zxvf go1.12.5.linux-amd64.tar.gz && \ mv go/ /usr/local/go RUN curl -sL https://go.kubebuilder.io/dl/2.0.1/linux/amd64 | tar -xz -C /tmp/ && \ mv /tmp/kubebuilder_2.0.1_linux_amd64 /usr/local/kubebuilder/ diff --git a/core-builder/Makefile b/core-builder/Makefile index 0106386c71..60bf31ce7f 100644 --- a/core-builder/Makefile +++ b/core-builder/Makefile @@ -1,5 +1,5 @@ DOCKER_IMAGE_NAME=seldonio/core-builder -DOCKER_IMAGE_VERSION=0.9 +DOCKER_IMAGE_VERSION=0.10 build_docker_image: docker build --force-rm=true -t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION) . diff --git a/jenkins-x-integration.yml b/jenkins-x-integration.yml index 46673aeaaf..9293d9f1b4 100644 --- a/jenkins-x-integration.yml +++ b/jenkins-x-integration.yml @@ -4,7 +4,7 @@ pipelineConfig: pullRequest: pipeline: agent: - image: seldonio/core-builder:0.9 + image: seldonio/core-builder:0.10 stages: - name: pr-build-comment steps: diff --git a/jenkins-x-lint.yml b/jenkins-x-lint.yml index e3bda967c7..349154d336 100644 --- a/jenkins-x-lint.yml +++ b/jenkins-x-lint.yml @@ -4,7 +4,7 @@ pipelineConfig: pullRequest: pipeline: agent: - image: seldonio/core-builder:0.9 + image: seldonio/core-builder:0.10 stages: - name: pr-build-comment steps: diff --git a/jenkins-x.yml b/jenkins-x.yml index 3f8ba0d5f8..95eb92d05a 100644 --- a/jenkins-x.yml +++ b/jenkins-x.yml @@ -10,7 +10,7 @@ pipelineConfig: pullRequest: pipeline: agent: - image: seldonio/core-builder:0.9 + image: seldonio/core-builder:0.10 stages: - name: pr-build-comment steps: @@ -54,7 +54,7 @@ pipelineConfig: command: echo "skipping tag" pipeline: agent: - image: seldonio/core-builder:0.4 + image: seldonio/core-builder:0.10 stages: - name: build-and-push steps: From eceb07c5e81db4a324f752ca959732693dec0ec5 Mon Sep 17 00:00:00 2001 From: Gurminder Sunner Date: Tue, 14 Jan 2020 13:34:11 +0000 Subject: [PATCH 3/3] fix operator build - controller-gen install for go modules --- operator/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/operator/Makefile b/operator/Makefile index 07fccfa545..96adb2d4b8 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -124,7 +124,14 @@ kind-image-install: docker-build # download controller-gen if necessary controller-gen: ifeq (, $(shell which controller-gen)) - go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.4 + @{ \ + set -e ;\ + CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\ + cd $$CONTROLLER_GEN_TMP_DIR ;\ + go mod init tmp ;\ + go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.4 ;\ + rm -rf $$CONTROLLER_GEN_TMP_DIR ;\ + } CONTROLLER_GEN=$(GOBIN)/controller-gen else CONTROLLER_GEN=$(shell which controller-gen)