Skip to content

Commit

Permalink
chore: Update versions of tools and libraries
Browse files Browse the repository at this point in the history
Including updated base image with go 1.17

(cherry picked from internal commit 76e18e9c18487591b308e47dbf3badcbad32998a)
  • Loading branch information
njhill committed Nov 20, 2021
1 parent 8fe405c commit 5355eb7
Show file tree
Hide file tree
Showing 9 changed files with 250 additions and 121 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/run-fvt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.17.3'
- name: Setup Minikube
run: |
wget --no-verbose https://github.com/kubernetes/minikube/releases/download/v1.21.0/minikube-linux-amd64
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# limitations under the License.
repos:
- repo: https://github.com/golangci/golangci-lint
rev: v1.42.1
rev: v1.43.0
hooks:
- id: golangci-lint
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.1.2
rev: v2.4.1
hooks:
- id: prettier
exclude: ^(.github/|.tekton/)
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile.develop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
###############################################################################
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4

ARG GOLANG_VERSION=1.16.6
ARG OPENSHIFT_VERSION=4.7.22
ARG KUSTOMIZE_VERSION=4.2.0
ENV KUBEBUILDER_VERSION=v3.1.0
ENV CONTROLLER_GEN_VERSION=v0.6.2
ARG GOLANG_VERSION=1.17.3
ARG OPENSHIFT_VERSION=4.9
ARG KUSTOMIZE_VERSION=4.4.0
ARG KUBEBUILDER_VERSION=v3.2.0
ARG CONTROLLER_GEN_VERSION=v0.7.0
ENV PATH=/usr/local/go/bin:$PATH:/usr/local/kubebuilder/bin:

USER root
Expand Down Expand Up @@ -62,7 +62,7 @@ RUN microdnf install \
&& curl -L https://github.com/kubernetes-sigs/kubebuilder/releases/download/${KUBEBUILDER_VERSION}/kubebuilder_linux_amd64 -o /usr/local/kubebuilder/bin/kubebuilder \
&& true && \
# download openshift-cli
curl -sSLf --output /tmp/oc_client.tar.gz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OPENSHIFT_VERSION}/openshift-client-linux.tar.gz \
curl -sSLf --output /tmp/oc_client.tar.gz https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest-${OPENSHIFT_VERSION}/openshift-client-linux.tar.gz \
&& tar -xvf /tmp/oc_client.tar.gz -C /tmp \
&& mv /tmp/oc /usr/local/bin \
&& mv /tmp/kubectl /usr/local/bin \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CRD_OPTIONS ?= "crd:trivialVersions=true"
# Namespace to deploy model-serve into
NAMESPACE ?= "model-serving"

CONTROLLER_GEN_VERSION ?= "v0.6.0"
CONTROLLER_GEN_VERSION ?= "v0.7.0"

# Model Mesh gRPC API Proto Generation
PROTO_FILES = $(shell find proto/ -iname "*.proto")
Expand Down
107 changes: 88 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,39 +1,108 @@
module github.com/kserve/modelmesh-serving

go 1.16
go 1.17

require (
github.com/dereklstinson/cifar v0.0.0-20200421171932-5722a3b6a0c7
github.com/go-logr/logr v0.4.0
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.6
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
github.com/manifestival/controller-runtime-client v0.4.0
github.com/manifestival/manifestival v0.7.0
github.com/moverest/mnist v0.0.0-20160628192128-ec5d9d203b59
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/operator-framework/operator-lib v0.6.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.49.0
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.1 // indirect
github.com/onsi/gomega v1.15.0
github.com/operator-framework/operator-lib v0.8.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.0
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.7.0
github.com/tommy351/goldga v0.3.0
go.etcd.io/etcd/api/v3 v3.5.0
go.etcd.io/etcd/client/v3 v3.5.0
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f // indirect
google.golang.org/grpc v1.39.0
go.etcd.io/etcd/api/v3 v3.5.1
go.etcd.io/etcd/client/v3 v3.5.1
google.golang.org/grpc v1.42.0
google.golang.org/protobuf v1.27.1
k8s.io/api v0.21.3
k8s.io/apimachinery v0.21.3
k8s.io/client-go v0.21.3
k8s.io/kube-openapi v0.0.0-20210305164622-f622666832c1 // indirect
sigs.k8s.io/controller-runtime v0.9.5
k8s.io/api v0.22.3
k8s.io/apimachinery v0.22.3
k8s.io/client-go v0.22.3
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20211021173138-95a400baf1a0
sigs.k8s.io/controller-runtime v0.10.2
sigs.k8s.io/yaml v1.2.0
)

require (
cloud.google.com/go v0.65.0 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.2.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/zapr v0.4.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pelletier/go-toml v1.2.0 // 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.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.1 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.22.3 // indirect
k8s.io/component-base v0.22.3 // indirect
k8s.io/klog/v2 v2.10.0 // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
)

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

0 comments on commit 5355eb7

Please sign in to comment.