Skip to content

NO-ISSUE: pkg/operator/status: Block ClusterVersion updates until multi-arch transitions complete #4637

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
merged 1 commit into from
Oct 22, 2024
Merged

NO-ISSUE: pkg/operator/status: Block ClusterVersion updates until multi-arch transitions complete #4637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cmd/machine-config-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ var (
func init() {
rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
rootCmd.PersistentFlags().StringVar(&version.ReleaseVersion, "payload-version", version.ReleaseVersion, "Version of the openshift release")
rootCmd.PersistentFlags().StringVar(&version.OperatorImage, "operator-image", version.OperatorImage, "Image pullspec for the current machine-config operator")
}

func main() {
Expand Down
1 change: 1 addition & 0 deletions install/0000_80_machine-config_04_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ spec:
- "start"
- "--images-json=/etc/mco/images/images.json"
- "--payload-version=0.0.1-snapshot"
- "--operator-image=placeholder.url.oc.will.replace.this.org/placeholdernamespace:machine-config-operator"
resources:
requests:
cpu: 20m
Expand Down
2 changes: 2 additions & 0 deletions install/0000_80_machine-config_06_clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ status:
versions:
- name: operator
version: "0.0.1-snapshot"
- name: operator-image
version: placeholder.url.oc.will.replace.this.org/placeholdernamespace:machine-config-operator
relatedObjects:
- group: ""
name: openshift-machine-config-operator
Expand Down
1 change: 1 addition & 0 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ func New(
optr.apiserverListerSynced = apiserverInformer.Informer().HasSynced

optr.vStore.Set("operator", version.ReleaseVersion)
optr.vStore.Set("operator-image", version.OperatorImage)

return optr
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ var (
// This will be injected by the payload build process.
ReleaseVersion = "0.0.1-snapshot"

// OperatorImage is the image pullspec for the current machine-config operator.
// This will be injected by the payload build process.
OperatorImage = "placeholder.url.oc.will.replace.this.org/placeholdernamespace:was-not-built-properly"

// Raw is the string representation of the version. This will be replaced
// with the calculated version at build time.
Raw = "v0.0.0-was-not-built-properly"
Expand Down