Skip to content

Commit 2eefd79

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1747 from deads2k/apply-01-revision
API-1835: update to use the latest revision controller
2 parents 48d9579 + a32a100 commit 2eefd79

File tree

93 files changed

+1056
-370
lines changed

Some content is hidden

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

93 files changed

+1056
-370
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 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.25
17-
github.com/openshift/api v0.0.0-20240924155631-232984653385
17+
github.com/openshift/api v0.0.0-20240930154731-d67159445fc4
1818
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
19-
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd
20-
github.com/openshift/library-go v0.0.0-20240924211342-f6478ea3357f
19+
github.com/openshift/client-go v0.0.0-20240925210910-aaed17e719c5
20+
github.com/openshift/library-go v0.0.0-20240930172803-190f286b06b1
2121
github.com/pkg/profile v1.5.0 // indirect
2222
github.com/prometheus/client_golang v1.16.0
2323
github.com/spf13/cobra v1.7.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY
151151
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
152152
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
153153
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
154-
github.com/openshift/api v0.0.0-20240924155631-232984653385 h1:P6O191HwBj0ahEfea2wkvxhmW2fzXhvCh8hwHDvUozM=
155-
github.com/openshift/api v0.0.0-20240924155631-232984653385/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
154+
github.com/openshift/api v0.0.0-20240930154731-d67159445fc4 h1:me9LFRvXcAbJ+YP7n0I6C47448VefursRnb+qxoA5Hw=
155+
github.com/openshift/api v0.0.0-20240930154731-d67159445fc4/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
156156
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs=
157157
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
158-
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd h1:Gd0+bYdcfGIsDOJ8BwTJJjQeXoziyIsTwqp/s38rKyM=
159-
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd/go.mod h1:EB7GeA/vpf9AHklMgnnT0+uG6l/3f8cChtCFbJFrk4g=
160-
github.com/openshift/library-go v0.0.0-20240924211342-f6478ea3357f h1:BE9hhv0XriQ4XIslufYaEe9nArf+CXDgn7d/Y3ATW4o=
161-
github.com/openshift/library-go v0.0.0-20240924211342-f6478ea3357f/go.mod h1:f8QcnrooSwGa96xI4UaKbKGJZskhTCGeimXKyc4t/ZU=
158+
github.com/openshift/client-go v0.0.0-20240925210910-aaed17e719c5 h1:1yz2alsLpp8L99THG6tWXzeds45hf6jXI4bNoTxEim8=
159+
github.com/openshift/client-go v0.0.0-20240925210910-aaed17e719c5/go.mod h1:axlsYEU3WeMRlIvHdsSKl/wP17k8oZgHCtPy9WgAMts=
160+
github.com/openshift/library-go v0.0.0-20240930172803-190f286b06b1 h1:LmCFe7kihBKR1fp9QyHwHqxbEOwMxNKBUGgbwdnuq9E=
161+
github.com/openshift/library-go v0.0.0-20240930172803-190f286b06b1/go.mod h1:v10EXeWyH3LImiMSySg4SrfiWVv89XHfGQyGyAcpQB4=
162162
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
163163
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
164164
github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=

‎pkg/operator/configobservation/configobservercontroller/observe_config_controller.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func NewConfigObserver(operatorClient v1helpers.StaticPodOperatorClient, kubeInf
7474

7575
c := &ConfigObserver{
7676
Controller: configobserver.NewConfigObserver(
77+
"kube-apiserver",
7778
operatorClient,
7879
eventRecorder,
7980
configobservation.Listers{

‎pkg/operator/resourcesynccontroller/resourcesynccontroller.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ func NewResourceSyncController(
1717
eventRecorder events.Recorder) (*resourcesynccontroller.ResourceSyncController, error) {
1818

1919
resourceSyncController := resourcesynccontroller.NewResourceSyncController(
20+
"kube-apiserver",
2021
operatorConfigClient,
2122
kubeInformersForNamespaces,
2223
v1helpers.CachedSecretGetter(kubeClient.CoreV1(), kubeInformersForNamespaces),

‎pkg/operator/starter.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
420420
)
421421

422422
auditPolicyController := auditpolicy.NewAuditPolicyController(
423+
"kube-apiserver",
423424
operatorclient.TargetNamespace,
424425
"kube-apiserver-audit-policies",
425426
configInformers.Config().V1().APIServers().Lister(),
@@ -452,6 +453,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
452453
)
453454

454455
latencyProfileController := latencyprofilecontroller.NewLatencyProfileController(
456+
"kube-apiserver",
455457
operatorClient,
456458
operatorclient.TargetNamespace,
457459
nil, // profile rejection logic is not required for this operator

‎vendor/github.com/openshift/api/operator/v1/types.go‎

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

‎vendor/github.com/openshift/api/operator/v1/types_ingress.go‎

Lines changed: 28 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/operator/v1/types_openshiftapiserver.go‎

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

‎vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_10_config-operator_01_configs.crd.yaml‎

Lines changed: 8 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/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.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.

0 commit comments

Comments
 (0)