Skip to content

Commit f2b862c

Browse files
Merge pull request #1837 from liouk/bump-library-go
OCPBUGS-52466: bump library-go to bring in updated audit policies
2 parents ea2dbbd + ac0635a commit f2b862c

File tree

49 files changed

+2219
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2219
-147
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ require (
1414
github.com/google/go-cmp v0.6.0
1515
github.com/imdario/mergo v0.3.8
1616
github.com/miekg/dns v1.1.61
17-
github.com/openshift/api v0.0.0-20250311085700-14a17c7009c4
17+
github.com/openshift/api v0.0.0-20250320170726-75d64d71980b
1818
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c
1919
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
20-
github.com/openshift/library-go v0.0.0-20250313122028-477d5d90df06
20+
github.com/openshift/library-go v0.0.0-20250505141135-5184403e7ead
2121
github.com/pkg/profile v1.7.0 // indirect
2222
github.com/prometheus/client_golang v1.19.1
2323
github.com/spf13/cobra v1.8.1

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
160160
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
161161
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
162162
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
163-
github.com/openshift/api v0.0.0-20250311085700-14a17c7009c4 h1:MC4ZZqMrvxJ7xK3BlPQ3jSjC/X3eX+zT+GI7OjsdHAA=
164-
github.com/openshift/api v0.0.0-20250311085700-14a17c7009c4/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
163+
github.com/openshift/api v0.0.0-20250320170726-75d64d71980b h1:GGuFSHESP0BSOu70AqV4u9IVrjYdaeu4Id+HXRIOvkw=
164+
github.com/openshift/api v0.0.0-20250320170726-75d64d71980b/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
165165
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c h1:6XcszPFZpan4qll5XbdLll7n1So3IsPn28aw2j1obMo=
166166
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
167167
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7 h1:4iliLcvr1P9EUMZgIaSNEKNQQzBn+L6PSequlFOuB6Q=
168168
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7/go.mod h1:2tcufBE4Cu6RNgDCxcUJepa530kGo5GFVfR9BSnndhI=
169-
github.com/openshift/library-go v0.0.0-20250313122028-477d5d90df06 h1:rhHuK51ZAAQnE4TolB9Zfmcs78qKnV4dTkwIF7z0vMA=
170-
github.com/openshift/library-go v0.0.0-20250313122028-477d5d90df06/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8=
169+
github.com/openshift/library-go v0.0.0-20250505141135-5184403e7ead h1:ZphMPDBoxhm7/4+5M2gO9h+TTDRcJpQ2Xa5P0Pn2JpA=
170+
github.com/openshift/library-go v0.0.0-20250505141135-5184403e7ead/go.mod h1:DAa3BGl0CFtkfJn/g5rU8kDDTErfMVA/QlFm4cvU+MI=
171171
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
172172
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
173173
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

pkg/operator/webhooksupportabilitycontroller/degraded_webhook_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"regexp"
99
"strconv"
1010
"testing"
11+
"time"
1112

1213
"github.com/google/go-cmp/cmp"
1314
operatorv1 "github.com/openshift/api/operator/v1"
@@ -99,7 +100,7 @@ func doNotStart() func(*mockWebhookServer) {
99100

100101
func withWrongCABundle(t *testing.T) func(*mockWebhookServer) {
101102
return func(s *mockWebhookServer) {
102-
cfg, err := crypto.MakeSelfSignedCAConfig(t.Name()+"WrongCA", 10)
103+
cfg, err := crypto.MakeSelfSignedCAConfig(t.Name()+"WrongCA", 10*24*time.Hour)
103104
if err == nil {
104105
s.CABundle, _, err = cfg.GetPEMBytes()
105106
}
@@ -126,7 +127,7 @@ type mockWebhookServer struct {
126127
// Run starts the mock server. Port and CABundle are available after this method returns.
127128
func (s *mockWebhookServer) Run(t *testing.T, ctx context.Context) {
128129
// CA certs
129-
rootCACertCfg, err := crypto.MakeSelfSignedCAConfig(t.Name()+"RootCA", 10)
130+
rootCACertCfg, err := crypto.MakeSelfSignedCAConfig(t.Name()+"RootCA", 10*24*time.Hour)
130131
if err != nil {
131132
t.Fatal(err)
132133
}
@@ -141,7 +142,7 @@ func (s *mockWebhookServer) Run(t *testing.T, ctx context.Context) {
141142
s.CABundle = []byte{}
142143
}
143144
// server certs
144-
serverCertCfg, err := rootCA.MakeServerCert(sets.New(s.Hostname, "127.0.0.1"), 10)
145+
serverCertCfg, err := rootCA.MakeServerCert(sets.New(s.Hostname, "127.0.0.1"), 10*24*time.Hour)
145146
if err != nil {
146147
t.Fatal(err)
147148
}

vendor/github.com/openshift/api/.golangci.yaml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/OWNERS

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/apiserver/v1/types_apirequestcount.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/apiserver/v1/zz_generated.crd-manifests/kube-apiserver_apirequestcounts.crd.yaml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/cloudnetwork/v1/generated.proto

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/cloudnetwork/v1/types.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types_authentication.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)