Skip to content

Commit a2c1a93

Browse files
committed
pkg/manifest: Restore CustomNoUpgrade handling
Avoiding failures like: $ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_cluster-capi-operator/181/pull-ci-openshift-cluster-capi-operator-main-e2e-aws-capi-techpreview/1806459134145466368/artifacts/e2e-aws-capi-techpreview/gather-extra/artifacts/pods/openshift-cluster-version_cluster-version-operator-85cdd86f99-nrqd6_cluster-version-operator_previous.log | grep '0000_30_cluster-api_00_namespace.yaml' I0627 23:22:20.849886 1 payload.go:210] excluding Filename: "0000_30_cluster-api_00_namespace.yaml" Group: "" Kind: "Namespace" Name: "openshift-cluster-api": unrecognized value "CustomNoUpgrade" in release.openshift.io/feature-set=CustomNoUpgrade,TechPreviewNoUpgrade; known values are: Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade I0627 23:22:21.820724 1 payload.go:210] excluding Filename: "0000_30_cluster-api_00_namespace.yaml" Group: "" Kind: "Namespace" Name: "openshift-cluster-api": unrecognized value "CustomNoUpgrade" in release.openshift.io/feature-set=CustomNoUpgrade,TechPreviewNoUpgrade; known values are: Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade because 679dc9f (React to changes coming from o/api features, 2024-04-05, #1711) accidentally dropped the set. 679dc9f also removed LatencySensitive, although that is ok because [1] intentionally pushed LatencySensitive clusters back into the default feature set in 4.14. [1]: http://issues.redhat.com/browse/OCPBUGS-15877
1 parent 51af916 commit a2c1a93

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pkg/manifest/manifest.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func init() {
4040
knownFeatureSets.Insert(string(featureSet))
4141
}
4242
}
43+
knownFeatureSets.Insert(string(configv1.CustomNoUpgrade))
4344
}
4445

4546
// resourceId uniquely identifies a Kubernetes resource.

pkg/manifest/manifest_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ func Test_include(t *testing.T) {
688688
"include.release.openshift.io/self-managed-high-availability": "true",
689689
"release.openshift.io/feature-set": "Other",
690690
},
691-
expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
691+
expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: CustomNoUpgrade,Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
692692
},
693693
{
694694
name: "incorrect techpreview value is not excluded if techpreview on using feature-set",
@@ -698,7 +698,7 @@ func Test_include(t *testing.T) {
698698
"include.release.openshift.io/self-managed-high-availability": "true",
699699
"release.openshift.io/feature-set": "Other",
700700
},
701-
expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
701+
expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: CustomNoUpgrade,Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
702702
},
703703
{
704704
name: "default profile selection excludes without annotation",

0 commit comments

Comments
 (0)