Skip to content

Commit 207bba7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #196 from damdo/openshift-fix-feature-setannotations
OCPBUGS-29519: openshift: add CustomNoUpgrade annotation value to feature-set
2 parents 1892065 + a0a1c10 commit 207bba7

File tree

7 files changed

+35
-31
lines changed

7 files changed

+35
-31
lines changed

‎openshift/manifests/0000_30_cluster-api_04_cm.core-cluster-api.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ data:
88
exclude.release.openshift.io/internal-openshift-hosted: "true"
99
include.release.openshift.io/self-managed-high-availability: "true"
1010
include.release.openshift.io/single-node-developer: "true"
11-
release.openshift.io/feature-set: TechPreviewNoUpgrade
11+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1212
creationTimestamp: null
1313
labels:
1414
cluster.x-k8s.io/provider: cluster-api
@@ -30,7 +30,7 @@ data:
3030
exclude.release.openshift.io/internal-openshift-hosted: "true"
3131
include.release.openshift.io/self-managed-high-availability: "true"
3232
include.release.openshift.io/single-node-developer: "true"
33-
release.openshift.io/feature-set: TechPreviewNoUpgrade
33+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
3434
labels:
3535
cluster.x-k8s.io/aggregate-to-manager: "true"
3636
cluster.x-k8s.io/provider: cluster-api
@@ -384,7 +384,7 @@ data:
384384
exclude.release.openshift.io/internal-openshift-hosted: "true"
385385
include.release.openshift.io/self-managed-high-availability: "true"
386386
include.release.openshift.io/single-node-developer: "true"
387-
release.openshift.io/feature-set: TechPreviewNoUpgrade
387+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
388388
labels:
389389
cluster.x-k8s.io/provider: cluster-api
390390
clusterctl.cluster.x-k8s.io: ""
@@ -398,7 +398,7 @@ data:
398398
exclude.release.openshift.io/internal-openshift-hosted: "true"
399399
include.release.openshift.io/self-managed-high-availability: "true"
400400
include.release.openshift.io/single-node-developer: "true"
401-
release.openshift.io/feature-set: TechPreviewNoUpgrade
401+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
402402
labels:
403403
cluster.x-k8s.io/provider: cluster-api
404404
clusterctl.cluster.x-k8s.io: ""
@@ -431,7 +431,7 @@ data:
431431
exclude.release.openshift.io/internal-openshift-hosted: "true"
432432
include.release.openshift.io/self-managed-high-availability: "true"
433433
include.release.openshift.io/single-node-developer: "true"
434-
release.openshift.io/feature-set: TechPreviewNoUpgrade
434+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
435435
creationTimestamp: null
436436
labels:
437437
cluster.x-k8s.io/provider: cluster-api
@@ -458,7 +458,7 @@ data:
458458
exclude.release.openshift.io/internal-openshift-hosted: "true"
459459
include.release.openshift.io/self-managed-high-availability: "true"
460460
include.release.openshift.io/single-node-developer: "true"
461-
release.openshift.io/feature-set: TechPreviewNoUpgrade
461+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
462462
labels:
463463
cluster.x-k8s.io/provider: cluster-api
464464
clusterctl.cluster.x-k8s.io: ""
@@ -951,7 +951,7 @@ data:
951951
exclude.release.openshift.io/internal-openshift-hosted: "true"
952952
include.release.openshift.io/self-managed-high-availability: "true"
953953
include.release.openshift.io/single-node-developer: "true"
954-
release.openshift.io/feature-set: TechPreviewNoUpgrade
954+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
955955
service.beta.openshift.io/serving-cert-secret-name: capi-webhook-service-cert
956956
labels:
957957
cluster.x-k8s.io/provider: cluster-api
@@ -1003,7 +1003,7 @@ metadata:
10031003
exclude.release.openshift.io/internal-openshift-hosted: "true"
10041004
include.release.openshift.io/self-managed-high-availability: "true"
10051005
include.release.openshift.io/single-node-developer: "true"
1006-
release.openshift.io/feature-set: TechPreviewNoUpgrade
1006+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
10071007
creationTimestamp: null
10081008
labels:
10091009
provider.cluster.x-k8s.io/name: cluster-api

‎openshift/manifests/0000_30_cluster-api_04_crd.core-cluster-api.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
exclude.release.openshift.io/internal-openshift-hosted: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
include.release.openshift.io/single-node-developer: "true"
9-
release.openshift.io/feature-set: TechPreviewNoUpgrade
9+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
1010
service.beta.openshift.io/inject-cabundle: "true"
1111
creationTimestamp: null
1212
labels:
@@ -1937,7 +1937,7 @@ metadata:
19371937
exclude.release.openshift.io/internal-openshift-hosted: "true"
19381938
include.release.openshift.io/self-managed-high-availability: "true"
19391939
include.release.openshift.io/single-node-developer: "true"
1940-
release.openshift.io/feature-set: TechPreviewNoUpgrade
1940+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
19411941
service.beta.openshift.io/inject-cabundle: "true"
19421942
creationTimestamp: null
19431943
labels:
@@ -3338,7 +3338,7 @@ metadata:
33383338
exclude.release.openshift.io/internal-openshift-hosted: "true"
33393339
include.release.openshift.io/self-managed-high-availability: "true"
33403340
include.release.openshift.io/single-node-developer: "true"
3341-
release.openshift.io/feature-set: TechPreviewNoUpgrade
3341+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
33423342
service.beta.openshift.io/inject-cabundle: "true"
33433343
creationTimestamp: null
33443344
labels:
@@ -4174,7 +4174,7 @@ metadata:
41744174
exclude.release.openshift.io/internal-openshift-hosted: "true"
41754175
include.release.openshift.io/self-managed-high-availability: "true"
41764176
include.release.openshift.io/single-node-developer: "true"
4177-
release.openshift.io/feature-set: TechPreviewNoUpgrade
4177+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
41784178
service.beta.openshift.io/inject-cabundle: "true"
41794179
creationTimestamp: null
41804180
labels:
@@ -5024,7 +5024,7 @@ metadata:
50245024
exclude.release.openshift.io/internal-openshift-hosted: "true"
50255025
include.release.openshift.io/self-managed-high-availability: "true"
50265026
include.release.openshift.io/single-node-developer: "true"
5027-
release.openshift.io/feature-set: TechPreviewNoUpgrade
5027+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
50285028
service.beta.openshift.io/inject-cabundle: "true"
50295029
creationTimestamp: null
50305030
labels:
@@ -6028,7 +6028,7 @@ metadata:
60286028
exclude.release.openshift.io/internal-openshift-hosted: "true"
60296029
include.release.openshift.io/self-managed-high-availability: "true"
60306030
include.release.openshift.io/single-node-developer: "true"
6031-
release.openshift.io/feature-set: TechPreviewNoUpgrade
6031+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
60326032
service.beta.openshift.io/inject-cabundle: "true"
60336033
creationTimestamp: null
60346034
labels:
@@ -6904,7 +6904,7 @@ metadata:
69046904
exclude.release.openshift.io/internal-openshift-hosted: "true"
69056905
include.release.openshift.io/self-managed-high-availability: "true"
69066906
include.release.openshift.io/single-node-developer: "true"
6907-
release.openshift.io/feature-set: TechPreviewNoUpgrade
6907+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
69086908
service.beta.openshift.io/inject-cabundle: "true"
69096909
creationTimestamp: null
69106910
labels:
@@ -7268,7 +7268,7 @@ metadata:
72687268
exclude.release.openshift.io/internal-openshift-hosted: "true"
72697269
include.release.openshift.io/self-managed-high-availability: "true"
72707270
include.release.openshift.io/single-node-developer: "true"
7271-
release.openshift.io/feature-set: TechPreviewNoUpgrade
7271+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
72727272
service.beta.openshift.io/inject-cabundle: "true"
72737273
creationTimestamp: null
72747274
labels:
@@ -7483,7 +7483,7 @@ metadata:
74837483
exclude.release.openshift.io/internal-openshift-hosted: "true"
74847484
include.release.openshift.io/self-managed-high-availability: "true"
74857485
include.release.openshift.io/single-node-developer: "true"
7486-
release.openshift.io/feature-set: TechPreviewNoUpgrade
7486+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
74877487
service.beta.openshift.io/inject-cabundle: "true"
74887488
creationTimestamp: null
74897489
labels:
@@ -8063,7 +8063,7 @@ metadata:
80638063
exclude.release.openshift.io/internal-openshift-hosted: "true"
80648064
include.release.openshift.io/self-managed-high-availability: "true"
80658065
include.release.openshift.io/single-node-developer: "true"
8066-
release.openshift.io/feature-set: TechPreviewNoUpgrade
8066+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
80678067
creationTimestamp: null
80688068
labels:
80698069
cluster.x-k8s.io/provider: cluster-api
@@ -8327,7 +8327,7 @@ metadata:
83278327
exclude.release.openshift.io/internal-openshift-hosted: "true"
83288328
include.release.openshift.io/self-managed-high-availability: "true"
83298329
include.release.openshift.io/single-node-developer: "true"
8330-
release.openshift.io/feature-set: TechPreviewNoUpgrade
8330+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
83318331
creationTimestamp: null
83328332
labels:
83338333
cluster.x-k8s.io/provider: cluster-api
@@ -8535,7 +8535,7 @@ metadata:
85358535
exclude.release.openshift.io/internal-openshift-hosted: "true"
85368536
include.release.openshift.io/self-managed-high-availability: "true"
85378537
include.release.openshift.io/single-node-developer: "true"
8538-
release.openshift.io/feature-set: TechPreviewNoUpgrade
8538+
release.openshift.io/feature-set: CustomNoUpgrade,TechPreviewNoUpgrade
85398539
creationTimestamp: null
85408540
labels:
85418541
cluster.x-k8s.io/provider: cluster-api

‎openshift/tools/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module tools
22

33
go 1.18
44

5-
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99
5+
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225
66

77
require (
88
github.com/MakeNowJust/heredoc v1.0.0 // indirect

‎openshift/tools/go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.m
777777
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
778778
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99 h1:xBz01PbsZ7HsttZ0PQVKTvUKLZByS5ktdJBr75kP1E4=
779779
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
780+
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225 h1:TVnzn4vcLgcR8jtt7SHpWWn/12W4yuEeWZaDldN/Lxw=
781+
github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225/go.mod h1:H95ZCEuVQWjL1E22PUrmvVvx4ULjeDLzSoJoxzgNTkc=
780782
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
781783
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
782784
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

‎openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/customizations.go‎

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openshift/tools/vendor/github.com/openshift/cluster-capi-operator/manifests-gen/providers.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎openshift/tools/vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ github.com/munnerz/goautoneg
170170
# github.com/opencontainers/go-digest v1.0.0
171171
## explicit; go 1.13
172172
github.com/opencontainers/go-digest
173-
# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215095648-dca27d1f8c99
173+
# github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240215153220-d299b8b0a225
174174
## explicit; go 1.18
175175
github.com/openshift/cluster-capi-operator/manifests-gen
176176
# github.com/pelletier/go-toml/v2 v2.0.8

0 commit comments

Comments
 (0)