Merge pull request #1619 from stlaz/ephemeral_endpoint_412

[4.12] OCPBUGS-8737: UPSTREAM: <drop>: bump apiserver-library-go for scc fix
openshift · Jul 4, 2023 · 1485cc9 · 1485cc9
2 parents c43ddea + 6958d8f
commit 1485cc9
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 36 deletions.
diff --git a/go.mod b/go.mod
@@ -58,7 +58,7 @@ require (
 	github.com/opencontainers/runc v1.1.6
 	github.com/opencontainers/selinux v1.10.0
 	github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e
-	github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681
+	github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04
 	github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
 	github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43
 	github.com/pkg/errors v0.9.1
@@ -497,7 +497,7 @@ replace (
 	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.10.0
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e
-	github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681
+	github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04
 	github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
 	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
 	github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43

diff --git a/go.sum b/go.sum
@@ -351,8 +351,8 @@ github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK9
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
 github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e h1:1MXi1NzWM2HVQrjL7rMz/43Py5WqfDCsl5tu7RU37XI=
 github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
-github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681 h1:N71UWk4rjtqzASGdnDcv9Myski9AZjfHEacDH/Tt424=
-github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681/go.mod h1:Rf4eEydKLk+BkXhb2oSxNJWWOdI/2XrU6Z9+Jn4AD6Q=
+github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04 h1:tDpDeF3GezbnjZVXgDq6vC8Y0xs4UnDe3fPZw4q8/WM=
+github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04/go.mod h1:Rf4eEydKLk+BkXhb2oSxNJWWOdI/2XrU6Z9+Jn4AD6Q=
 github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq9VciBR3Bve5ZWzSxdft7gaMVB3kS0rwg=
 github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
 github.com/openshift/google-cadvisor v0.45.0-openshift-4.12 h1:DP3SzRLGGA0ZsU3OGH1Wr4Ew3lNaxB638rILbtroHsk=

diff --git a/...m/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission/admission.go b/...m/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission/admission.go
diff --git a/....com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/matcher.go b/....com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/matcher.go
diff --git a/...com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go b/...com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccmatching/provider.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -738,7 +738,7 @@ github.com/openshift/api/security
 github.com/openshift/api/security/v1
 github.com/openshift/api/template/v1
 github.com/openshift/api/user/v1
-# github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681 => github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681
+# github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04 => github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04
 ## explicit; go 1.18
 github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy
 github.com/openshift/apiserver-library-go/pkg/admission/imagepolicy/apis/imagepolicy/v1
@@ -3032,7 +3032,7 @@ sigs.k8s.io/yaml
 # github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 # github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.10.0
 # github.com/openshift/api => github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e
-# github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681
+# github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20230628111429-48f403f18d04
 # github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
 # github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
 # github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43