Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions bindata/oauth-apiserver/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
matchLabels:
app: openshift-oauth-apiserver
apiserver: "true"
progressDeadlineSeconds: 900
template:
metadata:
name: openshift-oauth-apiserver
Expand Down
1 change: 1 addition & 0 deletions bindata/oauth-openshift/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
selector:
matchLabels:
app: oauth-openshift
progressDeadlineSeconds: 900
template:
metadata:
namespace: openshift-authentication
Expand Down
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/google/go-cmp v0.7.0
github.com/onsi/ginkgo/v2 v2.21.0
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251205182537-ff5553e56f33
github.com/openshift/api v0.0.0-20260126183958-606bd613f9f7
github.com/openshift/api v0.0.0-20260212193555-c06ab675261f
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13
github.com/openshift/library-go v0.0.0-20260210145149-d0e860e8d752
Expand Down Expand Up @@ -132,3 +132,6 @@ require (
)

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

// branch: workload-condition-overwrites
replace github.com/openshift/library-go => github.com/tchap/library-go v0.0.0-20260218224355-0b782a2d1e90
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,12 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251205182537-ff5553e56f33 h1:LJf6kWZQ36iako7WXRzdEa5XKrnyrAX8GBhlAcKRaZQ=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251205182537-ff5553e56f33/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
github.com/openshift/api v0.0.0-20260126183958-606bd613f9f7 h1:96rhgJpWlWzKEslMd6aYFMixV9vQVY32M71JcO4Gzn0=
github.com/openshift/api v0.0.0-20260126183958-606bd613f9f7/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/api v0.0.0-20260212193555-c06ab675261f h1:l1IgsK48Ym/nED30yfaCTF4MtswO1eOoyfXgh2rEmdw=
github.com/openshift/api v0.0.0-20260212193555-c06ab675261f/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+Sp5GGnjHDhT/a/nQ1xdp43UscBMr7G5wxsYotyhzJ4=
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13 h1:6rd4zSo2UaWQcAPZfHK9yzKVqH0BnMv1hqMzqXZyTds=
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13/go.mod h1:YvOmPmV7wcJxpfhTDuFqqs2Xpb3M3ovsM6Qs/i2ptq4=
github.com/openshift/library-go v0.0.0-20260210145149-d0e860e8d752 h1:KQj7j9VpMzv+gYerCgA9CbPehwGO3ARUg+B2Pt1YcWs=
github.com/openshift/library-go v0.0.0-20260210145149-d0e860e8d752/go.mod h1:DCRz1EgdayEmr9b6KXKDL+DWBN0rGHu/VYADeHzPoOk=
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/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 h1:PMTgifBcBRLJJiM+LgSzPDTk9/Rx4qS09OUrfpY6GBQ=
Expand Down Expand Up @@ -205,6 +203,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-20260218224355-0b782a2d1e90 h1:mPPzhgnfjXRgLd5E2JFi+vB3s4BSqk09vFFzMDv0tJE=
github.com/tchap/library-go v0.0.0-20260218224355-0b782a2d1e90/go.mod h1:K3FoNLgNBFYbFuG+Kr8usAnQxj1w84XogyUp2M8rK8k=
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
3 changes: 2 additions & 1 deletion pkg/operator/workload/testdata/sync_ds_scenario_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
operator.openshift.io/spec-hash: "92b16c3a4fed15e36762fdaea811c16499cd59d97aa342cd6f93dfe74b977a57"
operator.openshift.io/spec-hash: "7a9fc412104ef9bccb83ca436fc0564c6103b603441b8ec5677d3fb86c0999a4"
creationTimestamp: ~
labels:
apiserver: "true"
Expand All @@ -22,6 +22,7 @@ spec:
rollingUpdate:
maxUnavailable: 1
maxSurge: 0
progressDeadlineSeconds: 900
template:
metadata:
creationTimestamp: ~
Expand Down
3 changes: 2 additions & 1 deletion pkg/operator/workload/testdata/sync_ds_scenario_2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
operator.openshift.io/spec-hash: "eaa7741231940e5279e2a2e6394a9c6516fcf3ba2573136dcf0319776f21f47d"
operator.openshift.io/spec-hash: "129c97247fdc00a33eb2bafe37f39fbc0a2bd29f8efffc21a77f359fcc202d60"
creationTimestamp: ~
labels:
apiserver: "true"
Expand All @@ -22,6 +22,7 @@ spec:
rollingUpdate:
maxUnavailable: 1
maxSurge: 0
progressDeadlineSeconds: 900
template:
metadata:
creationTimestamp: ~
Expand Down
3 changes: 2 additions & 1 deletion pkg/operator/workload/testdata/sync_ds_scenario_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
openshiftapiservers.operator.openshift.io/operator-pull-spec: ""
operator.openshift.io/spec-hash: "187e7046690e53bab0761a419280e536304f3767614ab909e8e430d5264ac6ba"
operator.openshift.io/spec-hash: "1744ae66ec6576d4137244fe0c6528d0cd7cc20cf50c9faec2aa73cbf8af5b97"
creationTimestamp: ~
labels:
apiserver: "true"
Expand All @@ -22,6 +22,7 @@ spec:
rollingUpdate:
maxUnavailable: 1
maxSurge: 0
progressDeadlineSeconds: 900
template:
metadata:
creationTimestamp: ~
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/openshift/api/.coderabbit.yaml

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

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

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

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

4 changes: 1 addition & 3 deletions vendor/github.com/openshift/api/config/v1/types_network.go

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

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

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

Loading