Skip to content

Commit b618d5b

Browse files
committed
config/v1/types_cluster_version: Tighten force and rollback warnings
Apparently our existing wording is not sufficient to convince external customers that forcing a rollback is a risky move. Tighten the wording to try to be even more clear about the potential downsides. The guards force blasts through are designed to keep you safe!
1 parent 3856d77 commit b618d5b

11 files changed

+94
-46
lines changed

config/v1/types_cluster_version.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ type ClusterVersionSpec struct {
7272
//
7373
// If an upgrade fails the operator will halt and report status
7474
// about the failing component. Setting the desired update value back to
75-
// the previous version will cause a rollback to be attempted. Not all
76-
// rollbacks will succeed.
75+
// the previous version will cause a rollback to be attempted if the
76+
// previous version is within the current minor version. Not all
77+
// rollbacks will succeed, and some may unrecoverably break the
78+
// cluster.
7779
//
7880
// +optional
7981
DesiredUpdate *Update `json:"desiredUpdate,omitempty"`
@@ -718,9 +720,13 @@ type Update struct {
718720
Image string `json:"image"`
719721

720722
// force allows an administrator to update to an image that has failed
721-
// verification or upgradeable checks. This option should only
722-
// be used when the authenticity of the provided image has been verified out
723-
// of band because the provided image will run with full administrative access
723+
// verification or upgradeable checks that are designed to keep your
724+
// cluster safe. Only use this if:
725+
// * you are testing unsigned release images in short-lived test clusters or
726+
// * you are working around a known bug in the cluster-version
727+
// operator and you have verified the authenticity of the provided
728+
// image yourself.
729+
// The provided image will run with full administrative access
724730
// to the cluster. Do not use this flag with images that comes from unknown
725731
// or potentially malicious sources.
726732
//

config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ spec:
151151
152152
If an upgrade fails the operator will halt and report status
153153
about the failing component. Setting the desired update value back to
154-
the previous version will cause a rollback to be attempted. Not all
155-
rollbacks will succeed.
154+
the previous version will cause a rollback to be attempted if the
155+
previous version is within the current minor version. Not all
156+
rollbacks will succeed, and some may unrecoverably break the
157+
cluster.
156158
properties:
157159
architecture:
158160
description: |-
@@ -171,9 +173,13 @@ spec:
171173
force:
172174
description: |-
173175
force allows an administrator to update to an image that has failed
174-
verification or upgradeable checks. This option should only
175-
be used when the authenticity of the provided image has been verified out
176-
of band because the provided image will run with full administrative access
176+
verification or upgradeable checks that are designed to keep your
177+
cluster safe. Only use this if:
178+
* you are testing unsigned release images in short-lived test clusters or
179+
* you are working around a known bug in the cluster-version
180+
operator and you have verified the authenticity of the provided
181+
image yourself.
182+
The provided image will run with full administrative access
177183
to the cluster. Do not use this flag with images that comes from unknown
178184
or potentially malicious sources.
179185
type: boolean

config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ spec:
151151
152152
If an upgrade fails the operator will halt and report status
153153
about the failing component. Setting the desired update value back to
154-
the previous version will cause a rollback to be attempted. Not all
155-
rollbacks will succeed.
154+
the previous version will cause a rollback to be attempted if the
155+
previous version is within the current minor version. Not all
156+
rollbacks will succeed, and some may unrecoverably break the
157+
cluster.
156158
properties:
157159
architecture:
158160
description: |-
@@ -171,9 +173,13 @@ spec:
171173
force:
172174
description: |-
173175
force allows an administrator to update to an image that has failed
174-
verification or upgradeable checks. This option should only
175-
be used when the authenticity of the provided image has been verified out
176-
of band because the provided image will run with full administrative access
176+
verification or upgradeable checks that are designed to keep your
177+
cluster safe. Only use this if:
178+
* you are testing unsigned release images in short-lived test clusters or
179+
* you are working around a known bug in the cluster-version
180+
operator and you have verified the authenticity of the provided
181+
image yourself.
182+
The provided image will run with full administrative access
177183
to the cluster. Do not use this flag with images that comes from unknown
178184
or potentially malicious sources.
179185
type: boolean

config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ spec:
151151
152152
If an upgrade fails the operator will halt and report status
153153
about the failing component. Setting the desired update value back to
154-
the previous version will cause a rollback to be attempted. Not all
155-
rollbacks will succeed.
154+
the previous version will cause a rollback to be attempted if the
155+
previous version is within the current minor version. Not all
156+
rollbacks will succeed, and some may unrecoverably break the
157+
cluster.
156158
properties:
157159
architecture:
158160
description: |-
@@ -171,9 +173,13 @@ spec:
171173
force:
172174
description: |-
173175
force allows an administrator to update to an image that has failed
174-
verification or upgradeable checks. This option should only
175-
be used when the authenticity of the provided image has been verified out
176-
of band because the provided image will run with full administrative access
176+
verification or upgradeable checks that are designed to keep your
177+
cluster safe. Only use this if:
178+
* you are testing unsigned release images in short-lived test clusters or
179+
* you are working around a known bug in the cluster-version
180+
operator and you have verified the authenticity of the provided
181+
image yourself.
182+
The provided image will run with full administrative access
177183
to the cluster. Do not use this flag with images that comes from unknown
178184
or potentially malicious sources.
179185
type: boolean

config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ spec:
151151
152152
If an upgrade fails the operator will halt and report status
153153
about the failing component. Setting the desired update value back to
154-
the previous version will cause a rollback to be attempted. Not all
155-
rollbacks will succeed.
154+
the previous version will cause a rollback to be attempted if the
155+
previous version is within the current minor version. Not all
156+
rollbacks will succeed, and some may unrecoverably break the
157+
cluster.
156158
properties:
157159
architecture:
158160
description: |-
@@ -171,9 +173,13 @@ spec:
171173
force:
172174
description: |-
173175
force allows an administrator to update to an image that has failed
174-
verification or upgradeable checks. This option should only
175-
be used when the authenticity of the provided image has been verified out
176-
of band because the provided image will run with full administrative access
176+
verification or upgradeable checks that are designed to keep your
177+
cluster safe. Only use this if:
178+
* you are testing unsigned release images in short-lived test clusters or
179+
* you are working around a known bug in the cluster-version
180+
operator and you have verified the authenticity of the provided
181+
image yourself.
182+
The provided image will run with full administrative access
177183
to the cluster. Do not use this flag with images that comes from unknown
178184
or potentially malicious sources.
179185
type: boolean

config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/AAA_ungated.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ spec:
153153
154154
If an upgrade fails the operator will halt and report status
155155
about the failing component. Setting the desired update value back to
156-
the previous version will cause a rollback to be attempted. Not all
157-
rollbacks will succeed.
156+
the previous version will cause a rollback to be attempted if the
157+
previous version is within the current minor version. Not all
158+
rollbacks will succeed, and some may unrecoverably break the
159+
cluster.
158160
properties:
159161
architecture:
160162
description: |-
@@ -173,9 +175,13 @@ spec:
173175
force:
174176
description: |-
175177
force allows an administrator to update to an image that has failed
176-
verification or upgradeable checks. This option should only
177-
be used when the authenticity of the provided image has been verified out
178-
of band because the provided image will run with full administrative access
178+
verification or upgradeable checks that are designed to keep your
179+
cluster safe. Only use this if:
180+
* you are testing unsigned release images in short-lived test clusters or
181+
* you are working around a known bug in the cluster-version
182+
operator and you have verified the authenticity of the provided
183+
image yourself.
184+
The provided image will run with full administrative access
179185
to the cluster. Do not use this flag with images that comes from unknown
180186
or potentially malicious sources.
181187
type: boolean

config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/ImageStreamImportMode.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ spec:
153153
154154
If an upgrade fails the operator will halt and report status
155155
about the failing component. Setting the desired update value back to
156-
the previous version will cause a rollback to be attempted. Not all
157-
rollbacks will succeed.
156+
the previous version will cause a rollback to be attempted if the
157+
previous version is within the current minor version. Not all
158+
rollbacks will succeed, and some may unrecoverably break the
159+
cluster.
158160
properties:
159161
architecture:
160162
description: |-
@@ -173,9 +175,13 @@ spec:
173175
force:
174176
description: |-
175177
force allows an administrator to update to an image that has failed
176-
verification or upgradeable checks. This option should only
177-
be used when the authenticity of the provided image has been verified out
178-
of band because the provided image will run with full administrative access
178+
verification or upgradeable checks that are designed to keep your
179+
cluster safe. Only use this if:
180+
* you are testing unsigned release images in short-lived test clusters or
181+
* you are working around a known bug in the cluster-version
182+
operator and you have verified the authenticity of the provided
183+
image yourself.
184+
The provided image will run with full administrative access
179185
to the cluster. Do not use this flag with images that comes from unknown
180186
or potentially malicious sources.
181187
type: boolean

config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/SignatureStores.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ spec:
153153
154154
If an upgrade fails the operator will halt and report status
155155
about the failing component. Setting the desired update value back to
156-
the previous version will cause a rollback to be attempted. Not all
157-
rollbacks will succeed.
156+
the previous version will cause a rollback to be attempted if the
157+
previous version is within the current minor version. Not all
158+
rollbacks will succeed, and some may unrecoverably break the
159+
cluster.
158160
properties:
159161
architecture:
160162
description: |-
@@ -173,9 +175,13 @@ spec:
173175
force:
174176
description: |-
175177
force allows an administrator to update to an image that has failed
176-
verification or upgradeable checks. This option should only
177-
be used when the authenticity of the provided image has been verified out
178-
of band because the provided image will run with full administrative access
178+
verification or upgradeable checks that are designed to keep your
179+
cluster safe. Only use this if:
180+
* you are testing unsigned release images in short-lived test clusters or
181+
* you are working around a known bug in the cluster-version
182+
operator and you have verified the authenticity of the provided
183+
image yourself.
184+
The provided image will run with full administrative access
179185
to the cluster. Do not use this flag with images that comes from unknown
180186
or potentially malicious sources.
181187
type: boolean

0 commit comments

Comments
 (0)