feat: improve reconcile and add status conditions on all api objects

DEVELOPMENT.md

@@ -92,7 +92,13 @@ Clone the `garm-provider-k8s` repo:
    $ git clone https://github.com/mercedes-benz/garm-provider-k8s && cd ./garm-provider-k8s
    ```
 And follow this [guide](https://github.com/mercedes-benz/garm-provider-k8s/blob/main/DEVELOPMENT.md). But `instead` of the `make tilt-up` in the `garm-provider-k8s` repo, execute the folling command. Make sure you are in your `kind-garm-operator` kubernetes context:
+This will build a GitHub actions runner image and a garm-server image and bootstrap the garm-server in your local `kind` cluster:
    ```bash
-   $ RUNNER_IMAGE="localhost:5000/runner:linux-ubuntu-22.04-x86_64" make build copy docker-build docker-build-summerwind-runner && kubectl apply -k hack/local-development/kubernetes/
+   $ make build copy docker-build docker-build-summerwind-runner && kubectl apply -k hack/local-development/kubernetes/
+   ```
+
+Deploy the `garm-operator` CRs to your local `kind` cluster:
+   ```bash
+   $ kubectl apply -k hack/local-development/kubernetes/garm-operator-crs.yaml
    ```
 Essentially this does the same as the `make tilt-up` target in `garm-provider-k8s`, but in your local garm-operator cluster. Otherwise, a separate cluster will be spawned with the latest garm-operator release.

Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # Build the manager binary
-FROM golang:1.24.4 as builder
+FROM golang:1.24.9 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

Makefile

@@ -173,7 +173,6 @@ MOCKGEN ?= $(LOCALBIN)/mockgen
 GORELEASER ?= $(LOCALBIN)/goreleaser
 MDTOC ?= $(LOCALBIN)/mdtoc
 SLICE ?= $(LOCALBIN)/kubectl-slice
-NANCY ?= $(LOCALBIN)/nancy
 GOVULNCHECK ?= $(LOCALBIN)/govulncheck
 KBOM ?= $(LOCALBIN)/bom
 KIND ?= $(LOCALBIN)/kind
@@ -247,12 +246,6 @@ $(SLICE): $(LOCALBIN)
 	test -s $(LOCALBIN)/kubectl-slice && $(LOCALBIN)/kubectl-slice --version | grep -q $(SLICE_VERSION) || \
 	GOBIN=$(LOCALBIN) go install github.com/patrickdappollonio/kubectl-slice@$(SLICE_VERSION)
 
-.PHONY: nancy
-nancy: $(NANCY) ## Download nancy locally if necessary. If wrong version is installed, it will be overwritten.
-$(NANCY): $(LOCALBIN)
-	test -s $(LOCALBIN)/nancy && $(LOCALBIN)/nancy --version | grep -q $(NANCY_VERSION) || \
-	GOBIN=$(LOCALBIN) go install github.com/sonatype-nexus-community/nancy@$(NANCY_VERSION)
-
 .PHONY: govulncheck
 govulncheck: $(GOVULNCHECK) ## Download govulncheck locally if necessary. If wrong version is installed, it will be overwritten.
 $(GOVULNCHECK): $(LOCALBIN)
@@ -311,17 +304,13 @@ verify-doctoc: generate-doctoc
 	fi
 
 .PHONY: verify-security
-verify-security: govulncheck-scan nancy-scan ## Verify security by running govulncheck and nancy
+verify-security: govulncheck-scan ## Verify security by running govulncheck
 	@echo "Security checks passed"
 
 .PHONY: govulncheck-scan
 govulncheck-scan: govulncheck ## Perform govulncheck scan
 	$(GOVULNCHECK) ./...
 
-.PHONY: nancy-scan
-nancy-scan: nancy ## Perform nancy scan
-	go list -json -deps ./... | $(NANCY) sleuth
-
 ##@ Documentation
 .PHONY: generate-doctoc
 generate-doctoc: mdtoc ## Generate documentation table of contents

api/v1alpha1/enterprise_types.go

@@ -41,6 +41,24 @@ type Enterprise struct {
 	Status EnterpriseStatus `json:"status,omitempty"`
 }
 
+func (e *Enterprise) InitializeConditions() {
+	if conditions.Get(e, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(e, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.PoolManager) == nil {
+		conditions.MarkUnknown(e, conditions.PoolManager, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.WebhookSecretReference) == nil {
+		conditions.MarkUnknown(e, conditions.WebhookSecretReference, conditions.UnknownReason, conditions.WebhookSecretNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.GithubCredentialsReference) == nil {
+		conditions.MarkUnknown(e, conditions.GithubCredentialsReference, conditions.UnknownReason, conditions.CredentialsNotReconciledYetMsg)
+	}
+}
+
 func (e *Enterprise) SetConditions(conditions []metav1.Condition) {
 	e.Status.Conditions = conditions
 }

api/v1alpha1/organization_types.go

@@ -41,6 +41,24 @@ type Organization struct {
 	Status OrganizationStatus `json:"status,omitempty"`
 }
 
+func (o *Organization) InitializeConditions() {
+	if conditions.Get(o, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(o, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(o, conditions.PoolManager) == nil {
+		conditions.MarkUnknown(o, conditions.PoolManager, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(o, conditions.WebhookSecretReference) == nil {
+		conditions.MarkUnknown(o, conditions.WebhookSecretReference, conditions.UnknownReason, conditions.WebhookSecretNotReconciledYetMsg)
+	}
+
+	if conditions.Get(o, conditions.GithubCredentialsReference) == nil {
+		conditions.MarkUnknown(o, conditions.GithubCredentialsReference, conditions.UnknownReason, conditions.CredentialsNotReconciledYetMsg)
+	}
+}
+
 func (o *Organization) SetConditions(conditions []metav1.Condition) {
 	o.Status.Conditions = conditions
 }

api/v1alpha1/repository_types.go

@@ -42,6 +42,24 @@ type Repository struct {
 	Status RepositoryStatus `json:"status,omitempty"`
 }
 
+func (r *Repository) InitializeConditions() {
+	if conditions.Get(r, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(r, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(r, conditions.PoolManager) == nil {
+		conditions.MarkUnknown(r, conditions.PoolManager, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(r, conditions.WebhookSecretReference) == nil {
+		conditions.MarkUnknown(r, conditions.WebhookSecretReference, conditions.UnknownReason, conditions.WebhookSecretNotReconciledYetMsg)
+	}
+
+	if conditions.Get(r, conditions.GithubCredentialsReference) == nil {
+		conditions.MarkUnknown(r, conditions.GithubCredentialsReference, conditions.UnknownReason, conditions.CredentialsNotReconciledYetMsg)
+	}
+}
+
 func (r *Repository) SetConditions(conditions []metav1.Condition) {
 	r.Status.Conditions = conditions
 }

api/v1alpha1/runner_conversion.go

@@ -2,6 +2,7 @@
 package v1alpha1
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	"github.com/mercedes-benz/garm-operator/api/v1beta1"
@@ -16,3 +17,22 @@ func (r *Runner) ConvertTo(dstRaw conversion.Hub) error {
 func (r *Runner) ConvertFrom(dstRaw conversion.Hub) error {
 	return Convert_v1beta1_Runner_To_v1alpha1_Runner(dstRaw.(*v1beta1.Runner), r, nil)
 }
+
+func Convert_v1beta1_RunnerStatus_To_v1alpha1_RunnerStatus(in *v1beta1.RunnerStatus, out *RunnerStatus, s apiconversion.Scope) error {
+	out.ID = in.ID
+	out.ProviderID = in.ProviderID
+	out.AgentID = in.AgentID
+	out.Name = in.Name
+	out.OSType = in.OSType
+	out.OSName = in.OSName
+	out.OSVersion = in.OSVersion
+	out.OSArch = in.OSArch
+	out.Addresses = nil
+	out.Status = in.Status
+	out.InstanceStatus = in.InstanceStatus
+	out.PoolID = in.PoolID
+	out.ProviderFault = in.ProviderFault
+	out.GitHubRunnerGroup = in.GitHubRunnerGroup
+
+	return autoConvert_v1beta1_RunnerStatus_To_v1alpha1_RunnerStatus(in, out, s)
+}

api/v1alpha1/runner_types.go

@@ -50,11 +50,11 @@ type RunnerStatus struct {
 	// for this instance.
 	Addresses []commonParams.Address `json:"addresses,omitempty"`
 
-	// Status is the status of the instance inside the provider (eg: running, stopped, etc)
-	Status commonParams.InstanceStatus `json:"status,omitempty"`
+	// Status is the runner status as it appears on GitHub. (idle, pending, ...)
+	Status params.RunnerStatus `json:"status,omitempty"`
 
-	// RunnerStatus is the github runner status as it appears on GitHub.
-	InstanceStatus params.RunnerStatus `json:"instanceStatus,omitempty"`
+	// InstanceStatus of the instance inside the respective cloud provider of the physical instance (eg: running, stopped, ...)
+	InstanceStatus commonParams.InstanceStatus `json:"instanceStatus,omitempty"`
 
 	// PoolID is the ID of the garm pool to which a runner belongs.
 	PoolID string `json:"poolId,omitempty"`

api/v1beta1/enterprise_types.go

@@ -44,6 +44,24 @@ type Enterprise struct {
 	Status EnterpriseStatus `json:"status,omitempty"`
 }
 
+func (e *Enterprise) InitializeConditions() {
+	if conditions.Get(e, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(e, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.PoolManager) == nil {
+		conditions.MarkUnknown(e, conditions.PoolManager, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.WebhookSecretReference) == nil {
+		conditions.MarkUnknown(e, conditions.WebhookSecretReference, conditions.UnknownReason, conditions.WebhookSecretNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.GithubCredentialsReference) == nil {
+		conditions.MarkUnknown(e, conditions.GithubCredentialsReference, conditions.UnknownReason, conditions.CredentialsNotReconciledYetMsg)
+	}
+}
+
 func (e *Enterprise) SetConditions(conditions []metav1.Condition) {
 	e.Status.Conditions = conditions
 }

api/v1beta1/garmserverconfig_types.go

@@ -4,6 +4,8 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/mercedes-benz/garm-operator/pkg/conditions"
 )
 
 // GarmServerConfigSpec defines the desired state of GarmServerConfig
@@ -47,6 +49,12 @@ type GarmServerConfig struct {
 	Status GarmServerConfigStatus `json:"status,omitempty"`
 }
 
+func (g *GarmServerConfig) InitializeConditions() {
+	if conditions.Get(g, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(g, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+}
+
 func (g *GarmServerConfig) SetConditions(conditions []metav1.Condition) {
 	g.Status.Conditions = conditions
 }

api/v1beta1/githubcredentials_types.go

@@ -6,6 +6,8 @@ import (
 	"github.com/cloudbase/garm/params"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/mercedes-benz/garm-operator/pkg/conditions"
 )
 
 // GitHubCredentialSpec defines the desired state of GitHubCredential
@@ -60,6 +62,20 @@ type GitHubCredential struct {
 	Status GitHubCredentialStatus `json:"status,omitempty"`
 }
 
+func (g *GitHubCredential) InitializeConditions() {
+	if conditions.Get(g, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(g, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(g, conditions.GithubEndpointReference) == nil {
+		conditions.MarkUnknown(g, conditions.GithubEndpointReference, conditions.UnknownReason, conditions.GithubEndpointNotReconciledYetMsg)
+	}
+
+	if conditions.Get(g, conditions.WebhookSecretReference) == nil {
+		conditions.MarkUnknown(g, conditions.WebhookSecretReference, conditions.UnknownReason, conditions.WebhookSecretNotReconciledYetMsg)
+	}
+}
+
 func (g *GitHubCredential) SetConditions(conditions []metav1.Condition) {
 	g.Status.Conditions = conditions
 }

api/v1beta1/githubendpoint_types.go

@@ -4,6 +4,8 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/mercedes-benz/garm-operator/pkg/conditions"
 )
 
 // GitHubEndpointSpec defines the desired state of GitHubEndpoint
@@ -38,6 +40,16 @@ type GitHubEndpoint struct {
 	Status GitHubEndpointStatus `json:"status,omitempty"`
 }
 
+func (e *GitHubEndpoint) InitializeConditions() {
+	if conditions.Get(e, conditions.ReadyCondition) == nil {
+		conditions.MarkUnknown(e, conditions.ReadyCondition, conditions.UnknownReason, conditions.GarmServerNotReconciledYetMsg)
+	}
+
+	if conditions.Get(e, conditions.WebhookSecretReference) == nil {
+		conditions.MarkUnknown(e, conditions.WebhookSecretReference, conditions.UnknownReason, conditions.WebhookSecretNotReconciledYetMsg)
+	}
+}
+
 func (e *GitHubEndpoint) SetConditions(conditions []metav1.Condition) {
 	e.Status.Conditions = conditions
 }