Skip to content

Commit

Permalink
Merge branch 'release-0.14' into automated-backport-of-#2822-origin-r…
Browse files Browse the repository at this point in the history
…elease-0.14
  • Loading branch information
tpantelis authored Oct 19, 2023
2 parents b02c657 + 4c4c4f2 commit 24bd0e5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions api/v1alpha1/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package v1alpha1

var (
DefaultRepo = "quay.io/submariner"
DefaultSubmarinerOperatorVersion = "0.14.6"
DefaultSubmarinerVersion = "0.14.6"
DefaultLighthouseVersion = "0.14.6"
DefaultSubmarinerOperatorVersion = "0.14.7"
DefaultSubmarinerVersion = "0.14.7"
DefaultLighthouseVersion = "0.14.7"
)
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.60.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.60.1
github.com/prometheus/client_golang v1.13.0
github.com/submariner-io/admiral v0.14.6
github.com/submariner-io/shipyard v0.14.6
github.com/submariner-io/submariner v0.14.6
github.com/submariner-io/admiral v0.14.7
github.com/submariner-io/shipyard v0.14.7
github.com/submariner-io/submariner v0.14.7
github.com/uw-labs/lichen v0.1.7
golang.org/x/text v0.8.0
k8s.io/api v0.25.14
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -724,12 +724,12 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/submariner-io/admiral v0.14.6 h1:nldWyCPKCSM+pqGQp+zpX034a2Mv2gSjC15ks/9BDhY=
github.com/submariner-io/admiral v0.14.6/go.mod h1:CjX+2lwJ0/g9rb5bO1Im7dWfq+1BngeDqTUn24tPXHM=
github.com/submariner-io/shipyard v0.14.6 h1:px9FggiMyjFRLDyf8ieihvvk75QnG3G4fXKQSwp99P0=
github.com/submariner-io/shipyard v0.14.6/go.mod h1:v71szzcgslSBHx9V6kVggxNUljtqNPHq+z/NT2rejYA=
github.com/submariner-io/submariner v0.14.6 h1:eLnf/FjQLJqhlS/3MIP9qILl6hwMUX3MSi1X0ydYdGU=
github.com/submariner-io/submariner v0.14.6/go.mod h1:xep7W0sgmYCxw49EPVg6Sezwt4/PfZn+5AevjSr3U18=
github.com/submariner-io/admiral v0.14.7 h1:F7HOZ7QU0y387SrcV3kkcMBis6e/MzmAePQtUY1tgsw=
github.com/submariner-io/admiral v0.14.7/go.mod h1:ovdgoPkunqzpgrwjV6CoV5sNhREJiOQFSq+wfUzy0/g=
github.com/submariner-io/shipyard v0.14.7 h1:cInosH/cqus30JCusOH5FHFaYDi037WbmPPETaA5QjY=
github.com/submariner-io/shipyard v0.14.7/go.mod h1:K1C+7V0FMc5GwkHBNIumO+hRejXkgMGLMtVK/bHgg8U=
github.com/submariner-io/submariner v0.14.7 h1:5bmdgFNdPKPIWHgP17D5PcJbthtbOo5uX8YLbg8mo+I=
github.com/submariner-io/submariner v0.14.7/go.mod h1:4TcqUzQDfpmdXTVtA3IseJnFX6nnjqZP6Wb4pYHrQL8=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down

0 comments on commit 24bd0e5

Please sign in to comment.