Skip to content

Commit

Permalink
Update kind (SeldonIO#3571)
Browse files Browse the repository at this point in the history
* Updated core builder image

* Updated core builder image

* Updating kind of kind

* Dropped operator upgrades before 1.2.3

* Updated to start at 1.3.0

* update core-builder tag to 0.25

* fix kubebuilder installation in core-builder

* extend update tests

Co-authored-by: Alejandro Saucedo <[email protected]>
  • Loading branch information
RafalSkolasinski and axsaucedo authored Sep 7, 2021
1 parent 7916e00 commit cb14f81
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 24 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
docs-lint:

runs-on: ubuntu-18.04
container: seldonio/core-builder:0.22
container: seldonio/core-builder:0.25

steps:
- uses: actions/checkout@v2
Expand All @@ -21,11 +21,10 @@ jobs:
docs-build:

runs-on: ubuntu-18.04
container: seldonio/core-builder:0.22
container: seldonio/core-builder:0.25

steps:
- uses: actions/checkout@v2
- name: docs-build-step
run: |
make -C doc install-dev html
3 changes: 1 addition & 2 deletions .github/workflows/executor_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ jobs:
executor-lint:

runs-on: ubuntu-18.04
container: seldonio/core-builder:0.22
container: seldonio/core-builder:0.25

steps:
- uses: actions/checkout@v2
- name: test-executor
run: |
make -C executor lint
3 changes: 1 addition & 2 deletions .github/workflows/executor_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ jobs:
executor-tests:

runs-on: ubuntu-18.04
container: seldonio/core-builder:0.22
container: seldonio/core-builder:0.25

steps:
- uses: actions/checkout@v2
- name: test-executor
run: |
make -C executor test
3 changes: 1 addition & 2 deletions .github/workflows/operator_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ jobs:
operator-lint:

runs-on: ubuntu-18.04
container: seldonio/core-builder:0.22
container: seldonio/core-builder:0.25

steps:
- uses: actions/checkout@v2
- name: test-executor
run: |
make -C operator lint
3 changes: 1 addition & 2 deletions .github/workflows/operator_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ jobs:
operator-tests:

runs-on: ubuntu-18.04
container: seldonio/core-builder:0.22
container: seldonio/core-builder:0.25

steps:
- uses: actions/checkout@v2
- name: test-operator
run: |
make -C operator test
3 changes: 1 addition & 2 deletions .lighthouse/jenkins-x/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: benchmark-step
image: seldonio/core-builder:0.22
image: seldonio/core-builder:0.25
env:
- name: SELDON_E2E_TESTS_TO_RUN
value: benchmark
Expand Down Expand Up @@ -63,4 +63,3 @@ spec:
serviceAccountName: tekton-bot
timeout: 6h0m0s
status: {}

3 changes: 1 addition & 2 deletions .lighthouse/jenkins-x/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: integration-step
image: seldonio/core-builder:0.22
image: seldonio/core-builder:0.25
env:
- name: SELDON_E2E_TESTS_TO_RUN
value: base
Expand Down Expand Up @@ -67,4 +67,3 @@ spec:
serviceAccountName: tekton-bot
timeout: 6h0m0s
status: {}

2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/models.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: models-step
image: seldonio/core-builder:0.23
image: seldonio/core-builder:0.25
command:
- bash
- -c
Expand Down
3 changes: 1 addition & 2 deletions .lighthouse/jenkins-x/notebooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: notebooks-step
image: seldonio/core-builder:0.22
image: seldonio/core-builder:0.25
env:
- name: SELDON_E2E_TESTS_TO_RUN
value: notebooks
Expand Down Expand Up @@ -67,4 +67,3 @@ spec:
serviceAccountName: tekton-bot
timeout: 6h0m0s
status: {}

2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: release-step
image: seldonio/core-builder:0.23
image: seldonio/core-builder:0.25
command:
- bash
- -c
Expand Down
6 changes: 4 additions & 2 deletions core-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN wget https://github.com/openshift/source-to-image/releases/download/v1.1.14/
mv ./sti /bin

# Installing KIND
RUN wget https://github.com/kubernetes-sigs/kind/releases/download/v0.6.1/kind-linux-amd64 && \
RUN wget https://github.com/kubernetes-sigs/kind/releases/download/v0.11.1/kind-linux-amd64 && \
chmod +x kind-linux-amd64 && \
mv ./kind-linux-amd64 /bin/kind

Expand Down Expand Up @@ -94,7 +94,9 @@ ENV PATH /usr/local/go/bin:$PATH
RUN wget https://dl.google.com/go/go1.16.5.linux-amd64.tar.gz && \
tar -zxvf go1.16.5.linux-amd64.tar.gz && \
mv go/ /usr/local/go
RUN curl -sL https://go.kubebuilder.io/dl/2.3.0/linux/amd64 | tar -xz -C /tmp/ && \

# Install kubebuilder (using github link)
RUN curl -sL https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.0/kubebuilder_2.3.0_linux_amd64.tar.gz | tar -xz -C /tmp/ && \
mv /tmp/kubebuilder_2.3.0_linux_amd64 /usr/local/kubebuilder/
ENV PATH /usr/local/kubebuilder/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion core-builder/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DOCKER_IMAGE_NAME=seldonio/core-builder
DOCKER_IMAGE_VERSION=0.23
DOCKER_IMAGE_VERSION=0.25

build_docker_image:
cp ../testing/scripts/dev_requirements.txt .
Expand Down
2 changes: 1 addition & 1 deletion testing/resources/kind_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
- role: worker
Expand Down
11 changes: 10 additions & 1 deletion testing/scripts/test_operator_updates.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@
wait_for_status,
)

SELDON_VERSIONS_TO_TEST = ["1.0.2", "1.1.0", "1.2.3", "1.3.0", "1.4.0"]
SELDON_VERSIONS_TO_TEST = [
"1.3.0",
"1.4.0",
"1.5.0",
"1.6.0",
"1.7.0",
"1.8.0",
"1.9.0",
"1.10.0",
]


@pytest.mark.sequential
Expand Down

0 comments on commit cb14f81

Please sign in to comment.