Skip to content

MCO-1227: Run boot image controller only when required #4477

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

Merged
openshift-merge-bot merged 2 commits into from
Jul 23, 2024
+8,175 −150
Merged

MCO-1227: Run boot image controller only when required #4477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5e5a11
make go-deps for API bump
djoshy Jul 15, 2024
c1cc9e0
controller: add infra check for msbic
djoshy Jul 17, 2024
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
2 changes: 1 addition & 1 deletion cmd/machine-config-controller/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func runStartCmd(_ *cobra.Command, _ []string) {
ctrlctx.InformerFactory.Start(ctrlctx.Stop)
}

if fg.Enabled(features.FeatureGateManagedBootImages) {
if ctrlcommon.IsBootImageControllerRequired(ctrlctx) {
machineSetBootImage := machinesetbootimage.New(
ctrlctx.ClientBuilder.KubeClientOrDie("machine-set-boot-image-controller"),
ctrlctx.ClientBuilder.MachineClientOrDie("machine-set-boot-image-controller"),
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/google/renameio v0.1.0
github.com/imdario/mergo v0.3.13
github.com/opencontainers/go-digest v1.0.0
github.com/openshift/api v0.0.0-20240610131338-a837bee24500
github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b
Expand Down Expand Up @@ -312,7 +312,7 @@ require (
go.uber.org/zap v1.26.0 // indirect
go4.org v0.0.0-20200104003542-c7e774b10ea0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
Expand Down
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 @@ -586,8 +586,8 @@ github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/api v0.0.0-20240610131338-a837bee24500 h1:LHpSWs+zfkvf+hppDWKsKnB5cbzLbUa3MEX0/qtnvAQ=
github.com/openshift/api v0.0.0-20240610131338-a837bee24500/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357 h1:yp8QH1cSR7zynJlJMdluuD/QEGxY980uV1cooF2snio=
github.com/openshift/api v0.0.0-20240715101244-b0adfa1f6357/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
github.com/openshift/kube-openapi v0.0.0-20230816122517-ffc8f001abb0 h1:GPlAy197Jkr+D0T2FNWanamraTdzS/r9ZkT29lxvHaA=
Expand Down
2 changes: 2 additions & 0 deletions install/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
15 changes: 9 additions & 6 deletions install/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,20 +1989,23 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud
service. Possible values are: CIS, COS, DNSServices,
GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private
IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
service. Possible values are: CIS, COS, COSConfig,
DNSServices, GlobalCatalog, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect,
ResourceController, ResourceManager, or VPC.
For example, the IBM Cloud Private IAM service
could be configured with the service `name`
of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service
for US South (Dallas) could be configured
with the service `name` of `VPC` and `url`
of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
15 changes: 9 additions & 6 deletions install/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,20 +1741,23 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud
service. Possible values are: CIS, COS, DNSServices,
GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private
IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
service. Possible values are: CIS, COS, COSConfig,
DNSServices, GlobalCatalog, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect,
ResourceController, ResourceManager, or VPC.
For example, the IBM Cloud Private IAM service
could be configured with the service `name`
of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service
for US South (Dallas) could be configured
with the service `name` of `VPC` and `url`
of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
15 changes: 9 additions & 6 deletions install/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,20 +1989,23 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud
service. Possible values are: CIS, COS, DNSServices,
GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private
IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
service. Possible values are: CIS, COS, COSConfig,
DNSServices, GlobalCatalog, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect,
ResourceController, ResourceManager, or VPC.
For example, the IBM Cloud Private IAM service
could be configured with the service `name`
of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service
for US South (Dallas) could be configured
with the service `name` of `VPC` and `url`
of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
15 changes: 9 additions & 6 deletions install/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,20 +1989,23 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud
service. Possible values are: CIS, COS, DNSServices,
GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private
IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
service. Possible values are: CIS, COS, COSConfig,
DNSServices, GlobalCatalog, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect,
ResourceController, ResourceManager, or VPC.
For example, the IBM Cloud Private IAM service
could be configured with the service `name`
of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service
for US South (Dallas) could be configured
with the service `name` of `VPC` and `url`
of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
2 changes: 2 additions & 0 deletions install/0000_80_machine-config_01_kubeletconfigs.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
4 changes: 4 additions & 0 deletions install/0000_80_machine-config_01_machineconfigpools-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -280,11 +282,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
4 changes: 4 additions & 0 deletions install/0000_80_machine-config_01_machineconfigpools-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -280,11 +282,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
4 changes: 4 additions & 0 deletions install/0000_80_machine-config_01_machineconfigpools-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -280,11 +282,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
4 changes: 4 additions & 0 deletions install/0000_80_machine-config_01_machineconfigpools-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down Expand Up @@ -280,11 +282,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
2 changes: 2 additions & 0 deletions install/0000_80_machine-config_01_machineconfigurations-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
2 changes: 2 additions & 0 deletions install/0000_80_machine-config_01_machineconfigurations-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
2 changes: 2 additions & 0 deletions install/0000_80_machine-config_01_machineconfigurations-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,13 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
Expand Down
Loading