public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge ebb857b325 into 0baa4f6b09

This commit is contained in:
Stewart Thomson 2025-10-22 16:41:43 +02:00 committed by GitHub
parent 0baa4f6b09 ebb857b325
commit 91ce588090
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apis/actions.summerwind.net/v1alpha1/runnerdeployment_types.go
View File

@ -72,11 +72,16 @@ type RunnerDeploymentStatus struct {
// Replicas is the total number of replicas
// +optional
Replicas *int `json:"replicas"`
// Selector is the string form of the pod selector
// +optional
Selector string `json:"selector"`
}
// +kubebuilder:object:root=true
// +kubebuilder:resource:shortName=rdeploy
// +kubebuilder:subresource:status
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.enterprise",name=Enterprise,type=string
// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.organization",name=Organization,type=string
// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.repository",name=Repository,type=string

5
apis/actions.summerwind.net/v1alpha1/runnerset_types.go
View File

@ -69,10 +69,15 @@ type RunnerSetStatus struct {
// Replicas is the total number of replicas
// +optional
Replicas *int `json:"replicas"`
// Selector is the string form of the pod selector
// +optional
Selector string `json:"selector"`
}
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
// +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number
// +kubebuilder:printcolumn:JSONPath=".status.replicas",name=Current,type=number
// +kubebuilder:printcolumn:JSONPath=".status.updatedReplicas",name=Up-To-Date,type=number

7
charts/actions-runner-controller/crds/actions.summerwind.dev_runnerdeployments.yaml
View File

@ -9882,6 +9882,9 @@ spec:
replicas:
description: Replicas is the total number of replicas
type: integer
selector:
description: Selector is the string form of the pod selector
type: string
updatedReplicas:
description: |-
ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
@ -9892,4 +9895,8 @@ spec:
served: true
storage: true
subresources:
scale:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}

7
charts/actions-runner-controller/crds/actions.summerwind.dev_runnersets.yaml
View File

@ -8759,6 +8759,9 @@ spec:
replicas:
description: Replicas is the total number of replicas
type: integer
selector:
description: Selector is the string form of the pod selector
type: string
updatedReplicas:
description: |-
ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
@ -8769,4 +8772,8 @@ spec:
served: true
storage: true
subresources:
scale:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}

7
config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
View File

@ -9882,6 +9882,9 @@ spec:
replicas:
description: Replicas is the total number of replicas
type: integer
selector:
description: Selector is the string form of the pod selector
type: string
updatedReplicas:
description: |-
ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
@ -9892,4 +9895,8 @@ spec:
served: true
storage: true
subresources:
scale:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}

7
config/crd/bases/actions.summerwind.dev_runnersets.yaml
View File

@ -8759,6 +8759,9 @@ spec:
replicas:
description: Replicas is the total number of replicas
type: integer
selector:
description: Selector is the string form of the pod selector
type: string
updatedReplicas:
description: |-
ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
@ -8769,4 +8772,8 @@ spec:
served: true
storage: true
subresources:
scale:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}

7
controllers/actions.summerwind.net/runnerdeployment_controller.go
View File

@ -313,6 +313,13 @@ func (r *RunnerDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Req
status.DesiredReplicas = &newDesiredReplicas
status.Replicas = &totalCurrentReplicas
status.UpdatedReplicas = &updatedReplicas
selector, err := metav1.LabelSelectorAsSelector(rd.Spec.Selector)
if err != nil {
log.Error(err, "Failed to retrieve pod labels")
return ctrl.Result{}, err
}
status.Selector = selector.String()
if !reflect.DeepEqual(rd.Status, status) {
updated := rd.DeepCopy()

7
controllers/actions.summerwind.net/runnerset_controller.go
View File

@ -157,6 +157,13 @@ func (r *RunnerSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
status.DesiredReplicas = &newDesiredReplicas
status.Replicas = &statusReplicas
status.UpdatedReplicas = &updatedReplicas
selector, err := metav1.LabelSelectorAsSelector(runnerSet.Spec.Selector)
if err != nil {
log.Error(err, "Failed to retrieve pod labels")
return ctrl.Result{}, err
}
status.Selector = selector.String()
if !reflect.DeepEqual(runnerSet.Status, status) {
updated := runnerSet.DeepCopy()