Commit a2c1a93
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-158771 parent 51af916 commit a2c1a93
2 files changed
+3
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
688 | 688 | | |
689 | 689 | | |
690 | 690 | | |
691 | | - | |
| 691 | + | |
692 | 692 | | |
693 | 693 | | |
694 | 694 | | |
| |||
698 | 698 | | |
699 | 699 | | |
700 | 700 | | |
701 | | - | |
| 701 | + | |
702 | 702 | | |
703 | 703 | | |
704 | 704 | | |
| |||
0 commit comments