Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit 85bea2f

Browse files
authored
update ocm api to v0.11.0 (#111)
Signed-off-by: haoqing0110 <[email protected]>
1 parent 0bcab43 commit 85bea2f

23 files changed

+3386
-2257
lines changed

deploy/hub/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml

Lines changed: 260 additions & 179 deletions
Large diffs are not rendered by default.

deploy/hub/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml

Lines changed: 353 additions & 242 deletions
Large diffs are not rendered by default.

deploy/hub/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml

Lines changed: 221 additions & 153 deletions
Large diffs are not rendered by default.

deploy/hub/0000_02_clusters.open-cluster-management.io_placements.crd.yaml

Lines changed: 459 additions & 275 deletions
Large diffs are not rendered by default.

deploy/hub/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,65 @@ spec:
99
listKind: PlacementDecisionList
1010
plural: placementdecisions
1111
singular: placementdecision
12-
scope: Namespaced
1312
preserveUnknownFields: false
13+
scope: Namespaced
1414
versions:
15-
- name: v1beta1
16-
schema:
17-
openAPIV3Schema:
18-
description: "PlacementDecision indicates a decision from a placement PlacementDecision should has a label cluster.open-cluster-management.io/placement={placement name} to reference a certain placement. \n If a placement has spec.numberOfClusters specified, the total number of decisions contained in status.decisions of PlacementDecisions should always be NumberOfClusters; otherwise, the total number of decisions should be the number of ManagedClusters which match the placement requirements. \n Some of the decisions might be empty when there are no enough ManagedClusters meet the placement requirements."
19-
type: object
20-
properties:
21-
apiVersion:
22-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23-
type: string
24-
kind:
25-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
26-
type: string
27-
metadata:
28-
type: object
29-
status:
30-
description: Status represents the current status of the PlacementDecision
31-
type: object
32-
required:
33-
- decisions
34-
properties:
35-
decisions:
36-
description: Decisions is a slice of decisions according to a placement The number of decisions should not be larger than 100
37-
type: array
38-
items:
39-
description: ClusterDecision represents a decision from a placement An empty ClusterDecision indicates it is not scheduled yet.
40-
type: object
41-
required:
42-
- clusterName
43-
- reason
44-
properties:
45-
clusterName:
46-
description: ClusterName is the name of the ManagedCluster. If it is not empty, its value should be unique cross all placement decisions for the Placement.
47-
type: string
48-
reason:
49-
description: Reason represents the reason why the ManagedCluster is selected.
50-
type: string
51-
served: true
52-
storage: true
53-
subresources:
54-
status: {}
15+
- name: v1beta1
16+
schema:
17+
openAPIV3Schema:
18+
description: "PlacementDecision indicates a decision from a placement PlacementDecision
19+
should has a label cluster.open-cluster-management.io/placement={placement
20+
name} to reference a certain placement. \n If a placement has spec.numberOfClusters
21+
specified, the total number of decisions contained in status.decisions of
22+
PlacementDecisions should always be NumberOfClusters; otherwise, the total
23+
number of decisions should be the number of ManagedClusters which match
24+
the placement requirements. \n Some of the decisions might be empty when
25+
there are no enough ManagedClusters meet the placement requirements."
26+
properties:
27+
apiVersion:
28+
description: 'APIVersion defines the versioned schema of this representation
29+
of an object. Servers should convert recognized schemas to the latest
30+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
31+
type: string
32+
kind:
33+
description: 'Kind is a string value representing the REST resource this
34+
object represents. Servers may infer this from the endpoint the client
35+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
36+
type: string
37+
metadata:
38+
type: object
39+
status:
40+
description: Status represents the current status of the PlacementDecision
41+
properties:
42+
decisions:
43+
description: Decisions is a slice of decisions according to a placement
44+
The number of decisions should not be larger than 100
45+
items:
46+
description: ClusterDecision represents a decision from a placement
47+
An empty ClusterDecision indicates it is not scheduled yet.
48+
properties:
49+
clusterName:
50+
description: ClusterName is the name of the ManagedCluster.
51+
If it is not empty, its value should be unique cross all placement
52+
decisions for the Placement.
53+
type: string
54+
reason:
55+
description: Reason represents the reason why the ManagedCluster
56+
is selected.
57+
type: string
58+
required:
59+
- clusterName
60+
- reason
61+
type: object
62+
type: array
63+
required:
64+
- decisions
65+
type: object
66+
type: object
67+
served: true
68+
storage: true
69+
subresources:
70+
status: {}
5571
status:
5672
acceptedNames:
5773
kind: ""

deploy/hub/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml

Lines changed: 133 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -12,101 +12,139 @@ spec:
1212
preserveUnknownFields: false
1313
scope: Namespaced
1414
versions:
15-
- name: v1alpha1
16-
schema:
17-
openAPIV3Schema:
18-
description: AddOnPlacementScore represents a bundle of scores of one managed cluster, which could be used by placement. AddOnPlacementScore is a namespace scoped resource. The namespace of the resource is the cluster namespace.
19-
type: object
20-
properties:
21-
apiVersion:
22-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23-
type: string
24-
kind:
25-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
26-
type: string
27-
metadata:
28-
type: object
29-
status:
30-
description: Status represents the status of the AddOnPlacementScore.
31-
type: object
32-
properties:
33-
conditions:
34-
description: Conditions contain the different condition statuses for this AddOnPlacementScore.
35-
type: array
36-
items:
37-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
38-
type: object
39-
required:
40-
- lastTransitionTime
41-
- message
42-
- reason
43-
- status
44-
- type
45-
properties:
46-
lastTransitionTime:
47-
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
48-
type: string
49-
format: date-time
50-
message:
51-
description: message is a human readable message indicating details about the transition. This may be an empty string.
52-
type: string
53-
maxLength: 32768
54-
observedGeneration:
55-
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
56-
type: integer
57-
format: int64
58-
minimum: 0
59-
reason:
60-
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
61-
type: string
62-
maxLength: 1024
63-
minLength: 1
64-
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
65-
status:
66-
description: status of the condition, one of True, False, Unknown.
67-
type: string
68-
enum:
69-
- "True"
70-
- "False"
71-
- Unknown
72-
type:
73-
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
74-
type: string
75-
maxLength: 316
76-
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
77-
x-kubernetes-list-map-keys:
78-
- type
79-
x-kubernetes-list-type: map
80-
scores:
81-
description: Scores contain a list of score name and value of this managed cluster.
82-
type: array
83-
items:
84-
description: AddOnPlacementScoreItem represents the score name and value.
85-
type: object
86-
required:
87-
- name
88-
- value
89-
properties:
90-
name:
91-
description: Name is the name of the score
92-
type: string
93-
value:
94-
description: Value is the value of the score. The score range is from -100 to 100.
95-
type: integer
96-
format: int32
97-
maximum: 100
98-
minimum: -100
99-
x-kubernetes-list-map-keys:
100-
- name
101-
x-kubernetes-list-type: map
102-
validUntil:
103-
description: ValidUntil defines the valid time of the scores. After this time, the scores are considered to be invalid by placement. nil means never expire. The controller owning this resource should keep the scores up-to-date.
104-
type: string
105-
format: date-time
106-
served: true
107-
storage: true
108-
subresources:
109-
status: {}
15+
- name: v1alpha1
16+
schema:
17+
openAPIV3Schema:
18+
description: AddOnPlacementScore represents a bundle of scores of one managed
19+
cluster, which could be used by placement. AddOnPlacementScore is a namespace
20+
scoped resource. The namespace of the resource is the cluster namespace.
21+
properties:
22+
apiVersion:
23+
description: 'APIVersion defines the versioned schema of this representation
24+
of an object. Servers should convert recognized schemas to the latest
25+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26+
type: string
27+
kind:
28+
description: 'Kind is a string value representing the REST resource this
29+
object represents. Servers may infer this from the endpoint the client
30+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
type: string
32+
metadata:
33+
type: object
34+
status:
35+
description: Status represents the status of the AddOnPlacementScore.
36+
properties:
37+
conditions:
38+
description: Conditions contain the different condition statuses for
39+
this AddOnPlacementScore.
40+
items:
41+
description: "Condition contains details for one aspect of the current
42+
state of this API Resource. --- This struct is intended for direct
43+
use as an array at the field path .status.conditions. For example,
44+
\n type FooStatus struct{ // Represents the observations of a
45+
foo's current state. // Known .status.conditions.type are: \"Available\",
46+
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
47+
// +listType=map // +listMapKey=type Conditions []metav1.Condition
48+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
49+
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
50+
properties:
51+
lastTransitionTime:
52+
description: lastTransitionTime is the last time the condition
53+
transitioned from one status to another. This should be when
54+
the underlying condition changed. If that is not known, then
55+
using the time when the API field changed is acceptable.
56+
format: date-time
57+
type: string
58+
message:
59+
description: message is a human readable message indicating
60+
details about the transition. This may be an empty string.
61+
maxLength: 32768
62+
type: string
63+
observedGeneration:
64+
description: observedGeneration represents the .metadata.generation
65+
that the condition was set based upon. For instance, if .metadata.generation
66+
is currently 12, but the .status.conditions[x].observedGeneration
67+
is 9, the condition is out of date with respect to the current
68+
state of the instance.
69+
format: int64
70+
minimum: 0
71+
type: integer
72+
reason:
73+
description: reason contains a programmatic identifier indicating
74+
the reason for the condition's last transition. Producers
75+
of specific condition types may define expected values and
76+
meanings for this field, and whether the values are considered
77+
a guaranteed API. The value should be a CamelCase string.
78+
This field may not be empty.
79+
maxLength: 1024
80+
minLength: 1
81+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
82+
type: string
83+
status:
84+
description: status of the condition, one of True, False, Unknown.
85+
enum:
86+
- "True"
87+
- "False"
88+
- Unknown
89+
type: string
90+
type:
91+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
92+
--- Many .condition.type values are consistent across resources
93+
like Available, but because arbitrary conditions can be useful
94+
(see .node.status.conditions), the ability to deconflict is
95+
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
96+
maxLength: 316
97+
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
98+
type: string
99+
required:
100+
- lastTransitionTime
101+
- message
102+
- reason
103+
- status
104+
- type
105+
type: object
106+
type: array
107+
x-kubernetes-list-map-keys:
108+
- type
109+
x-kubernetes-list-type: map
110+
scores:
111+
description: Scores contain a list of score name and value of this
112+
managed cluster.
113+
items:
114+
description: AddOnPlacementScoreItem represents the score name and
115+
value.
116+
properties:
117+
name:
118+
description: Name is the name of the score
119+
type: string
120+
value:
121+
description: Value is the value of the score. The score range
122+
is from -100 to 100.
123+
format: int32
124+
maximum: 100
125+
minimum: -100
126+
type: integer
127+
required:
128+
- name
129+
- value
130+
type: object
131+
type: array
132+
x-kubernetes-list-map-keys:
133+
- name
134+
x-kubernetes-list-type: map
135+
validUntil:
136+
description: ValidUntil defines the valid time of the scores. After
137+
this time, the scores are considered to be invalid by placement.
138+
nil means never expire. The controller owning this resource should
139+
keep the scores up-to-date.
140+
format: date-time
141+
type: string
142+
type: object
143+
type: object
144+
served: true
145+
storage: true
146+
subresources:
147+
status: {}
110148
status:
111149
acceptedNames:
112150
kind: ""

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
k8s.io/component-base v0.26.3
1717
k8s.io/klog/v2 v2.90.1
1818
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
19-
open-cluster-management.io/api v0.10.1-0.20230310025041-ca0770573954
19+
open-cluster-management.io/api v0.11.0
2020
sigs.k8s.io/controller-runtime v0.14.5
2121
)
2222

0 commit comments

Comments
 (0)