Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modify status of poolservice #2019

Merged
merged 1 commit into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion charts/yurt-manager/crds/network.openyurt.io_poolservices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,26 @@ spec:
description: PoolServiceSpec defines the desired state of PoolService
properties:
loadBalancerClass:
description: Inherited from service spec.LoadBalancerClass
type: string
type: object
status:
description: PoolServiceStatus defines the observed state of PoolService
properties:
aggregateToAnnotations:
additionalProperties:
type: string
description: AggregateToAnnotations means that this information is
aggregated into the annotations of the service
type: object
aggregateToLabels:
additionalProperties:
type: string
description: AggregateToLabels means that this information is aggregated
into the labels of the service
type: object
conditions:
description: Current poolService state
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
Expand Down Expand Up @@ -122,7 +136,8 @@ spec:
type: object
type: array
loadBalancer:
description: LoadBalancerStatus represents the status of a load-balancer.
description: LoadBalancer contains the current status of the load-balancer
in the current nodepool
properties:
ingress:
description: Ingress is a list containing ingress points for the
Expand Down
1 change: 1 addition & 0 deletions hack/make-rules/kustomize_to_chart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ EOF
mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_gateways.raven.openyurt.io.yaml ${crd_dir}/raven.openyurt.io_gateways.yaml
mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_platformadmins.iot.openyurt.io.yaml ${crd_dir}/iot.openyurt.io_platformadmins.yaml
mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_nodebuckets.apps.openyurt.io.yaml ${crd_dir}/apps.openyurt.io_nodebuckets.yaml
mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_poolservices.network.openyurt.io.yaml ${crd_dir}/network.openyurt.io_poolservices.yaml
# TODO: In the future, the crd generation process of yurt-manager and yurt-iot-dock will be split. For now, manually remove it from the yurt-manager script
# mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_devices.iot.openyurt.io.yaml ${crd_dir}/iot.openyurt.io_devices.yaml
# mv ${crd_dir}/apiextensions.k8s.io_v1_customresourcedefinition_deviceservices.iot.openyurt.io.yaml ${crd_dir}/iot.openyurt.io_deviceservices.yaml
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/network/v1alpha1/poolservice_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ type PoolServiceStatus struct {
// LoadBalancer contains the current status of the load-balancer in the current nodepool
LoadBalancer v1.LoadBalancerStatus `json:"loadBalancer,omitempty"`

// AggregateToAnnotations means that this information is aggregated into the annotations of the service
AggregateToAnnotations map[string]string `json:"aggregateToAnnotations,omitempty"`

//AggregateToLabels means that this information is aggregated into the labels of the service
AggregateToLabels map[string]string `json:"aggregateToLabels,omitempty"`

// Current poolService state
Conditions []metav1.Condition `json:"conditions,omitempty"`
}
Expand Down
14 changes: 14 additions & 0 deletions pkg/apis/network/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading