Skip to content

Commit dcb3cf1

Browse files
bartoszmajsakbartoszmajsak
authored
Merge branch 'main' into propagate-extract-errors
2 parents c96987d + 3487f05 commit dcb3cf1

File tree

5 files changed

+27
-17
lines changed

5 files changed

+27
-17
lines changed

‎.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,31 @@ updates:
55
schedule:
66
interval: "weekly"
77
rebase-strategy: "disabled"
8+
# To be aligned with opendatahub-operator codebase these dependencies are ignored for now
9+
ignore:
10+
- dependency-name: "sigs.k8s.io/*"
11+
- dependency-name: "k8s.io/*"
812
reviewers:
13+
- aslakknutsen
914
- bartoszmajsak
15+
- cam-garrison
1016

1117
- package-ecosystem: "docker"
1218
directory: "/build"
1319
schedule:
1420
interval: "weekly"
1521
rebase-strategy: "disabled"
1622
reviewers:
23+
- aslakknutsen
1724
- bartoszmajsak
25+
- cam-garrison
1826

1927
- package-ecosystem: "github-actions"
2028
directory: "/" # resolved as .github/workflows
2129
schedule:
2230
interval: "weekly"
2331
rebase-strategy: "disabled"
2432
reviewers:
33+
- aslakknutsen
2534
- bartoszmajsak
35+
- cam-garrison

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
go-version-file: go.mod
2121
- name: golangci-lint
22-
uses: golangci/golangci-lint-action@v4
22+
uses: golangci/golangci-lint-action@v6
2323
with:
2424
version: v1.59.1
2525
skip-cache: true

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ require (
2020

2121
// Testing deps
2222
require (
23-
github.com/onsi/ginkgo/v2 v2.19.0
24-
github.com/onsi/gomega v1.33.1
23+
github.com/onsi/ginkgo/v2 v2.19.1
24+
github.com/onsi/gomega v1.34.0
2525
)
2626

2727
require (
@@ -73,7 +73,7 @@ require (
7373
golang.org/x/net v0.25.0 // indirect
7474
golang.org/x/oauth2 v0.12.0 // indirect
7575
golang.org/x/sync v0.7.0 // indirect
76-
golang.org/x/sys v0.20.0 // indirect
76+
golang.org/x/sys v0.21.0 // indirect
7777
golang.org/x/term v0.20.0 // indirect
7878
golang.org/x/text v0.15.0 // indirect
7979
golang.org/x/time v0.3.0 // indirect
@@ -82,7 +82,7 @@ require (
8282
google.golang.org/appengine v1.6.7 // indirect
8383
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
8484
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect
85-
google.golang.org/protobuf v1.33.0 // indirect
85+
google.golang.org/protobuf v1.34.1 // indirect
8686
gopkg.in/inf.v0 v0.9.1 // indirect
8787
gopkg.in/yaml.v2 v2.4.0 // indirect
8888
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
9494
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
9595
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
9696
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
97-
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
98-
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
99-
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
100-
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
97+
github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
98+
github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA=
99+
github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os=
100+
github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo=
101101
github.com/openshift/api v0.0.0-20230918194705-55e9a6dcc436 h1:mCh7661fpX91NCbB1+NfogNHE2luiskEwErY9uKie5A=
102102
github.com/openshift/api v0.0.0-20230918194705-55e9a6dcc436/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
103103
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -171,8 +171,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
171171
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
172172
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
173173
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
174-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
175-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
174+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
175+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
176176
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
177177
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
178178
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -201,8 +201,8 @@ google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA
201201
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk=
202202
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 h1:U7+wNaVuSTaUqNvK2+osJ9ejEZxbjHHk8F2b6Hpx0AE=
203203
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U=
204-
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
205-
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
204+
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
205+
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
206206
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
207207
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
208208
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎pkg/env/env_config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ func GetConfigFile() string {
4848
}
4949

5050
func GetGatewayNamespace() string {
51-
return getEnvOr(RouteGatewayNamespace, "opendatahub-ingress")
51+
return getEnvOr(RouteGatewayNamespace, "opendatahub-services")
5252
}
5353

5454
func GetGatewayService() string {
55-
return getEnvOr(RouteGatewayService, "istio-ingressgateway")
55+
return getEnvOr(RouteGatewayService, "opendatahub-ingress-router")
5656
}
5757

5858
func GetIngressSelectorKey() string {
59-
return getEnvOr(RouteIngressSelectorKey, "opendatahub")
59+
return getEnvOr(RouteIngressSelectorKey, "istio")
6060
}
6161

6262
func GetIngressSelectorValue() string {
63-
return getEnvOr(RouteIngressSelectorValue, "ingressgateway")
63+
return getEnvOr(RouteIngressSelectorValue, "opendatahub-ingress-gateway")
6464
}
6565

6666
func getEnvOr(key, defaultValue string) string {

0 commit comments

Comments
 (0)