Skip to content

WIP: OCPBUGS-65896: Update library-go to align Progressing condition #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tchap wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: OCPBUGS-65896: Update library-go to align Progressing condition #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa2b602
go mod vendor
tchap Aug 17, 2026
746cb56
Fix build errors after dep update
tchap Aug 17, 2026
62db21c
Regenerate test-data
tchap Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,6 @@ require (
)

replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1

// branch: pr2-progressing-rework
replace github.com/openshift/library-go => github.com/tchap/library-go v0.0.0-20260817131047-edce4e0d0c2a
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:Ui
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20260806041845-b74fb348f1e7 h1:Lphm0uMAyM26ibbOca0+dg7uLz7GmmrIdeWjzOh5R/U=
github.com/openshift/client-go v0.0.0-20260806041845-b74fb348f1e7/go.mod h1:u08LcpI8Hq3IpelQLbciGRa/P158cE/O3uQe2Bt3Roo=
github.com/openshift/library-go v0.0.0-20260806124457-39539af5eb2c h1:giNfw2fwyJS7yJNlFEfKvAVcMHohRdBZJ8E9zJ8FsSo=
github.com/openshift/library-go v0.0.0-20260806124457-39539af5eb2c/go.mod h1:IrZbEK+wVUMEd+aXzYR2DCCh0p5IaQ7DvycYGP7qIYM=
github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d h1:Rzx23P63JFNNz5D23ubhC0FCN5rK8CeJhKcq5QKcdyU=
github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d/go.mod h1:iVi9Bopa5cLhjG5ie9DoZVVqkH8BGb1FQVTtecOLn4I=
github.com/openshift/oauth-apiserver v0.0.0-20260520145010-97a820bd5412 h1:oDB0GmUXLp8y85fWz+LGRE0hM5JqbXTfNPi5GjEqiX0=
Expand Down Expand Up @@ -231,6 +229,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/tchap/library-go v0.0.0-20260817131047-edce4e0d0c2a h1:wqtJsxkJftFRPn0Uh3I3BEPPbKv7SvFWmkCzw8pPrAY=
github.com/tchap/library-go v0.0.0-20260817131047-edce4e0d0c2a/go.mod h1:IrZbEK+wVUMEd+aXzYR2DCCh0p5IaQ7DvycYGP7qIYM=
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import (
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
"github.com/openshift/library-go/pkg/operator/csr"
"github.com/openshift/library-go/pkg/operator/encryption"
encryptioncontrollers "github.com/openshift/library-go/pkg/operator/encryption/controllers"
"github.com/openshift/library-go/pkg/operator/encryption/controllers/migrators"
encryptiondeployer "github.com/openshift/library-go/pkg/operator/encryption/deployer"
kmspreflight "github.com/openshift/library-go/pkg/operator/encryption/kms/preflight"
Expand Down Expand Up @@ -718,6 +719,7 @@ func prepareOauthAPIServerOperator(
resourceSyncController,
authEncryptionStatusProvider,
kmspreflight.NewAlwaysSucceedKMSPreflightDeployer(),
encryptioncontrollers.NoopEncryptionConfigurationComputer{},
).WithUnsupportedConfigPrefixForEncryptionControllers(
oauthapiconfigobservercontroller.OAuthAPIServerConfigPrefix,
).WithFinalizerController(
Expand Down
2 changes: 1 addition & 1 deletion ...shift-COLON-openshift-authenticator-.yaml → ...shift-COLON-openshift-authenticator-.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
authentication.openshift.io/csr: openshift-authenticator
spec:
request: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0KTUlJQkRqQ0J0QUlCQURCU01WQXdUZ1lEVlFRREUwZHplWE4wWlcwNmMyVnlkbWxqWldGalkyOTFiblE2YjNCbApibk5vYVdaMExXOWhkWFJvTFdGd2FYTmxjblpsY2pwdmNHVnVjMmhwWm5RdFlYVjBhR1Z1ZEdsallYUnZjakJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkh0a0lWek9qTnI4OEVSeUxUbGpYZ1lLeURIeCtGbWQKRUJKSldqZ3NoNFpmY3BjWUJKd2YwWmxlVFNBMjFEZnQvNzdSbDhmNWJ0QXJzV1ZNbFNGbjl1Q2dBREFLQmdncQpoa2pPUFFRREFnTkpBREJHQWlFQWgyenZud3I2VTBmSHluQXI4Q3RjWWFRN3FxQ3ZISDdVZXF3eGdKVHJwT2NDCklRQ2E4Z3RrS3A3cXBZdmdXOTZDYitMb05ZU0xYY2YvZXdodWR6b05uemlETXc9PQotLS0tLUVORCBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0K
request: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0KTUlJQkREQ0J0QUlCQURCU01WQXdUZ1lEVlFRREUwZHplWE4wWlcwNmMyVnlkbWxqWldGalkyOTFiblE2YjNCbApibk5vYVdaMExXOWhkWFJvTFdGd2FYTmxjblpsY2pwdmNHVnVjMmhwWm5RdFlYVjBhR1Z1ZEdsallYUnZjakJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkluYWFRaFZFZXdCMjFFODVSZVlpakl6OG0rMDZ3VlMKRG1vUWJPT3F1NFV2UVdFU25rQkYwbW1SSkJwdzk2dEszU1FXRkJUY1Q1WUxNbjU0T2FHN1FqYWdBREFLQmdncQpoa2pPUFFRREFnTkhBREJFQWlBaEwwVEFHSFR2T2pWdllmVnkxS3N3V2xRVDQzY3gzMGIxOSsrbis1WkJTQUlnClFCVDNxL2lqbEdMc1d4M1lBMWdMRXFqQU5xMUJRY1dUSmNESmhta1Y0bUU9Ci0tLS0tRU5EIENFUlRJRklDQVRFIFJFUVVFU1QtLS0tLQo=
signerName: kubernetes.io/kube-apiserver-client
usages:
- digital signature
Expand Down
0 ...shift-COLON-openshift-authenticator-.yaml → ...shift-COLON-openshift-authenticator-.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...io/authentications/c5b3-body-cluster.yaml → ...io/authentications/28de-body-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ status:
type: APIServerDeploymentDegraded
- lastTransitionTime: "2024-10-14T22:38:20Z"
message: 'deployment/apiserver.openshift-oauth-apiserver: 0/1 pods have been updated
to the latest generation and 0/1 pods are available'
to the latest revision and 0/1 pods are available'
reason: PodsUpdating
status: "True"
type: APIServerDeploymentProgressing
Expand Down
0 ...uthentications/c5b3-metadata-cluster.yaml → ...uthentications/28de-metadata-cluster.yaml
View file
Open in desktop
File renamed without changes.
0 ...authentications/c5b3-options-cluster.yaml → ...authentications/28de-options-cluster.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...io/authentications/5749-body-cluster.yaml → ...io/authentications/1ead-body-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ status:
type: OAuthServerDeploymentDegraded
- lastTransitionTime: "2025-08-07T22:38:20Z"
message: 'deployment/oauth-openshift.openshift-authentication: 0/1 pods have been
updated to the latest generation and 0/1 pods are available'
updated to the latest revision and 0/1 pods are available'
reason: PodsUpdating
status: "True"
type: OAuthServerDeploymentProgressing
Expand Down
0 ...uthentications/5749-metadata-cluster.yaml → ...uthentications/1ead-metadata-cluster.yaml
View file
Open in desktop
File renamed without changes.
0 ...authentications/5749-options-cluster.yaml → ...authentications/1ead-options-cluster.yaml
View file
Open in desktop
File renamed without changes.
65 changes: 65 additions & 0 deletions vendor/github.com/openshift/library-go/pkg/apps/deployment/progressing.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions vendor/github.com/openshift/library-go/pkg/crypto/crypto.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 12 additions & 42 deletions ...or/github.com/openshift/library-go/pkg/operator/apiserver/controller/workload/workload.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 28 additions & 24 deletions ...b.com/openshift/library-go/pkg/operator/apiserver/controllerset/apiservercontrollerset.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/openshift/library-go/pkg/operator/encryption/controllers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading