Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Run GitHub actions on release-* branches #299

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Build and Push

on:
push:
branches: [main]
branches:
- 'main'
- 'release-*'
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Lint

on:
pull_request:
branches: [main]
branches:
- 'main'
- 'release-*'
paths-ignore:
- '.github/**'
- '.tekton/**'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/run-fvt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: FVTs

on:
pull_request:
branches: [main]
branches:
- 'main'
- 'release-*'
paths:
- '**'
- '!.github/**'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Unit Test

on:
pull_request:
branches: [main]
branches:
- 'main'
- 'release-*'
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
###############################################################################
# Stage 2: Copy build assets to create the smallest final runtime image
###############################################################################
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 AS runtime
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 AS runtime

ARG USER=2000
ARG IMAGE_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.develop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
###############################################################################
# Create the develop, test, and build environment
###############################################################################
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7

ARG GOLANG_VERSION=1.18.7
ARG GOLANG_VERSION=1.18.9
ARG OPENSHIFT_VERSION=4.9
ARG KUSTOMIZE_VERSION=4.5.2
ARG KUBEBUILDER_VERSION=v3.3.0
Expand Down
6 changes: 3 additions & 3 deletions config/default/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ podsPerRuntime: 2
headlessService: true
modelMeshImage:
name: kserve/modelmesh
tag: latest
tag: v0.10.0-rc0
modelMeshResources:
requests:
cpu: "300m"
Expand All @@ -29,7 +29,7 @@ restProxy:
port: 8008
image:
name: kserve/rest-proxy
tag: latest
tag: v0.1.4
resources:
requests:
cpu: "50m"
Expand All @@ -39,7 +39,7 @@ restProxy:
memory: "512Mi"
storageHelperImage:
name: kserve/modelmesh-runtime-adapter
tag: latest
tag: v0.10.0-rc0
command: ["/opt/app/puller"]
storageHelperResources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion config/dependencies/quickstart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ spec:
- name: MINIO_SECRET_KEY
value: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
# image: quay.io/cloudservices/minio:latest
image: kserve/modelmesh-minio-examples:latest
image: kserve/modelmesh-minio-examples:v0.10.0
name: minio
---
apiVersion: v1
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ images:
- name: modelmesh-controller
newName: kserve/modelmesh-controller
## NOTE THIS SHOULD BE REPLACED WITH LATEST CONTROLLER IMAGE TAG
newTag: latest
newTag: v0.10.0-rc0
6 changes: 3 additions & 3 deletions docs/component-versions.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Component versions

The following table shows the component versions for the latest modelmesh-serving release (v0.9.0).
The following table shows the component versions for the latest modelmesh-serving release (v0.10.0-rc0).
| Component | Description | Upstream Revision |
| - | - | - |
| ModelMesh | Serves as a general-purpose model serving management/routing layer | [v0.9.0](https://github.com/kserve/modelmesh/tree/v0.9.0) |
| ModelMesh Runtime Adapter | Contains the unified puller/runtime-adapter image | [v0.9.0](https://github.com/kserve/modelmesh-runtime-adapter/tree/v0.9.0) |
| ModelMesh | Serves as a general-purpose model serving management/routing layer | [v0.10.0-rc0](https://github.com/kserve/modelmesh/tree/v0.10.0-rc0) |
| ModelMesh Runtime Adapter | Contains the unified puller/runtime-adapter image | [v0.10.0-rc0](https://github.com/kserve/modelmesh-runtime-adapter/tree/v0.10.0-rc0) |
| REST Proxy | Supports inference requests using KServe V2 REST Predict Protocol | [v0.1.4](https://github.com/kserve/rest-proxy/tree/v0.1.4) |
2 changes: 1 addition & 1 deletion docs/install/install-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ A secret named `model-serving-etcd` will be created and passed to the controller
Install the latest release of [modelmesh-serving](https://github.com/kserve/modelmesh-serving) by first cloning the corresponding release branch:

```shell
RELEASE=release-0.9
RELEASE=release-0.10
git clone -b $RELEASE --depth 1 --single-branch https://github.com/kserve/modelmesh-serving.git
cd modelmesh-serving
```
Expand Down
36 changes: 20 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/go-logr/logr v1.2.3
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.8
github.com/kserve/kserve v0.9.1-0.20221013012311-335dfbcc461a
github.com/kserve/kserve v0.10.0-rc1
github.com/manifestival/controller-runtime-client v0.4.0
github.com/manifestival/manifestival v0.7.1
github.com/moverest/mnist v0.0.0-20160628192128-ec5d9d203b59
Expand All @@ -16,7 +16,7 @@ require (
github.com/operator-framework/operator-lib v0.10.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.55.0
github.com/spf13/viper v1.10.1
github.com/stretchr/testify v1.7.1
github.com/stretchr/testify v1.8.0
github.com/tommy351/goldga v0.5.0
go.etcd.io/etcd/api/v3 v3.5.3
go.etcd.io/etcd/client/v3 v3.5.3
Expand Down Expand Up @@ -76,17 +76,17 @@ require (
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
Expand All @@ -97,13 +97,13 @@ require (
go.opencensus.io v0.23.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
golang.org/x/sys v0.0.0-20220624220833-87e55d714810 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
golang.org/x/tools v0.1.9 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.93.0 // indirect
Expand All @@ -124,7 +124,11 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
)

replace go.uber.org/atomic => github.com/uber-go/atomic v1.9.0
replace (
github.com/kserve/kserve => github.com/kserve/kserve v0.10.0-rc0

// Update prometheus client to avoid CVE-2022-21698
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.1
// Update prometheus client to avoid CVE-2022-21698
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.1

go.uber.org/atomic => github.com/uber-go/atomic v1.9.0
)
Loading