Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Commit

Permalink
Bump versions
Browse files Browse the repository at this point in the history
Move the images to el9, bump to go 1.20.

Signed-off-by: Liran Rotenberg <lrotenbe@redhat.com>
  • Loading branch information
liranr23 committed Oct 17, 2023
1 parent 58898a6 commit a03849a
Show file tree
Hide file tree
Showing 6 changed files with 191 additions and 821 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.15.x, 1.16.x]
go-version: [1.20.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Builder image
FROM registry.access.redhat.com/ubi8/go-toolset:1.16.12 as builder
FROM registry.access.redhat.com/ubi9/go-toolset:1.19 as builder
ENV GOPATH=$APP_ROOT
RUN env
COPY . .
RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o app github.com/konveyor/forklift-must-gather-api/pkg
RUN GOOS=linux GOARCH=amd64 GOFLAGS=-buildvcs=false go build -ldflags="-w -s" -o app github.com/konveyor/forklift-must-gather-api/pkg

# OpenShift CLI image (oc)
FROM quay.io/openshift/origin-cli:4.10 as ocimage
FROM quay.io/openshift/origin-cli:4.13 as ocimage

# Runner image
FROM registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi9-minimal

LABEL name="konveyor/forklift-must-gather-api" \
description="Konveyor Must Gather API service" \
Expand Down
81 changes: 72 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,78 @@
module github.com/konveyor/forklift-must-gather-api

go 1.15
go 1.19

require (
github.com/gin-gonic/gin v1.9.1
github.com/mattn/go-sqlite3 v1.14.8 // indirect
github.com/ugorji/go v1.2.6 // indirect
gorm.io/driver/sqlite v1.1.4
gorm.io/gorm v1.21.12
k8s.io/api v0.21.4
k8s.io/client-go v0.21.4
k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime v0.9.7
gorm.io/driver/sqlite v1.5.4
gorm.io/gorm v1.25.5
k8s.io/api v0.28.2
k8s.io/client-go v0.28.2
k8s.io/kubectl v0.28.2
sigs.k8s.io/controller-runtime v0.16.2
)

require (
github.com/bytedance/sonic v1.9.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-sqlite3 v1.14.17 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apimachinery v0.28.2 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit a03849a

Please sign in to comment.