feat: garm v0.1.5

Makefile

@@ -49,8 +49,12 @@ help: ## Display this help.
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
+.PHONY: conversion
+conversion: conversion-gen
+	$(CONVERSION_GEN) --go-header-file hack/boilerplate.go.txt --output-file zz_generated.conversion.go github.com/mercedes-benz/garm-operator/api/v1alpha1
+
 .PHONY: generate
-generate: controller-gen mockgen ## Generate mock client and code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+generate: controller-gen conversion mockgen ## Generate mock client and code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 	go generate ./...
 
@@ -162,6 +166,7 @@ $(LOCALBIN):
 KUBECTL ?= kubectl
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
+CONVERSION_GEN ?= $(LOCALBIN)/conversion-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 MOCKGEN ?= $(LOCALBIN)/mockgen
@@ -176,6 +181,7 @@ KIND ?= $(LOCALBIN)/kind
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.0.1
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
+CONVERSION_GEN_VERSION ?= v0.30.5
 GOLANGCI_LINT_VERSION ?= v1.59.1
 MOCKGEN_VERSION ?= v0.4.0
 GORELEASER_VERSION ?= v1.21.0
@@ -200,6 +206,12 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 	test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
 	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
 
+.PHONY: conversion-gen
+conversion-gen: $(CONVERSION_GEN) ## Download conversion-gen locally if necessary. If wrong version is installed, it will be overwritten.
+$(CONVERSION_GEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/conversion-gen || \
+	GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/conversion-gen@$(CONVERSION_GEN_VERSION)
+
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)

PROJECT

@@ -1,5 +1,3 @@
-# SPDX-License-Identifier: MIT
-
 # Code generated by tool. DO NOT EDIT.
 # This file is used to track the info used to scaffold your project
 # and allow the plugins properly work.
@@ -71,4 +69,103 @@ resources:
   kind: Runner
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: GarmServerConfig
+  path: github.com/mercedes-benz/garm-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: GitHubEndpoint
+  path: github.com/mercedes-benz/garm-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: GitHubCredentials
+  path: github.com/mercedes-benz/garm-operator/api/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: Enterprise
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: Organization
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: Repository
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: Pool
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: Runner
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: Image
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: GitHubEndpoint
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: GitHubCredentials
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: mercedes-benz.com
+  group: garm-operator
+  kind: GarmServerConfig
+  path: github.com/mercedes-benz/garm-operator/api/v1beta1
+  version: v1beta1
 version: "3"

Tiltfile

@@ -18,7 +18,7 @@ deploy_cert_manager(
 # the manager binary and the dlv debug port will be exposed
 #
 # for more details, please read the DEVELOPMENT.md
-mode = 'local' 
+mode = 'local'
 
 # kustomize overlays
 templated_yaml = kustomize('config/overlays/' + mode)
@@ -36,6 +36,9 @@ k8s_resource(
         'pools.garm-operator.mercedes-benz.com:customresourcedefinition',
         'runners.garm-operator.mercedes-benz.com:customresourcedefinition',
         'repositories.garm-operator.mercedes-benz.com:customresourcedefinition',
+        'garmserverconfigs.garm-operator.mercedes-benz.com:customresourcedefinition',
+        'githubcredentials.garm-operator.mercedes-benz.com:customresourcedefinition',
+        'githubendpoints.garm-operator.mercedes-benz.com:customresourcedefinition',
         'garm-operator-controller-manager:serviceaccount',
         'garm-operator-leader-election-role:role',
         'garm-operator-manager-role:clusterrole',

api/v1alpha1/doc.go

@@ -0,0 +1,2 @@
+// +k8s:conversion-gen=github.com/mercedes-benz/garm-operator/api/v1beta1
+package v1alpha1

api/v1alpha1/enterprise_conversion.go

@@ -0,0 +1,23 @@
+package v1alpha1
+
+import (
+	"github.com/mercedes-benz/garm-operator/api/v1beta1"
+	v1 "k8s.io/api/core/v1"
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+)
+
+func Convert_v1alpha1_EnterpriseSpec_To_v1beta1_EnterpriseSpec(in *EnterpriseSpec, out *v1beta1.EnterpriseSpec, s apiconversion.Scope) error {
+	out.CredentialsRef = v1.TypedLocalObjectReference{
+		Name:     in.CredentialsName,
+		Kind:     "GitHubCredentials",
+		APIGroup: &v1beta1.GroupVersion.Group,
+	}
+
+	return autoConvert_v1alpha1_EnterpriseSpec_To_v1beta1_EnterpriseSpec(in, out, s)
+}
+
+func Convert_v1beta1_EnterpriseSpec_To_v1alpha1_EnterpriseSpec(in *v1beta1.EnterpriseSpec, out *EnterpriseSpec, s apiconversion.Scope) error {
+	out.CredentialsName = in.CredentialsRef.Name
+
+	return autoConvert_v1beta1_EnterpriseSpec_To_v1alpha1_EnterpriseSpec(in, out, s)
+}

api/v1alpha1/groupversion_info.go

@@ -19,4 +19,7 @@ var (
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
+
+	// localSchemeBuilder is getting used by the generated conversion
+	localSchemeBuilder = SchemeBuilder.SchemeBuilder
 )

api/v1alpha1/image_types.go

@@ -31,7 +31,7 @@ type ImageStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:path=images,scope=Namespaced,categories=garm
-//+kubebuilder:printcolumn:name="Tag",type=string,JSONPath=`.spec.tag`,priority=1
+//+kubebuilder:printcolumn:name="Tag",type=string,JSONPath=`.spec.tag`
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Image is the Schema for the images API

api/v1alpha1/organization_conversion.go

@@ -0,0 +1,23 @@
+package v1alpha1
+
+import (
+	v1beta1 "github.com/mercedes-benz/garm-operator/api/v1beta1"
+	v1 "k8s.io/api/core/v1"
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+)
+
+func Convert_v1alpha1_OrganizationSpec_To_v1beta1_OrganizationSpec(in *OrganizationSpec, out *v1beta1.OrganizationSpec, s apiconversion.Scope) error {
+	out.CredentialsRef = v1.TypedLocalObjectReference{
+		Name:     in.CredentialsName,
+		Kind:     "GitHubCredentials",
+		APIGroup: &v1beta1.GroupVersion.Group,
+	}
+
+	return autoConvert_v1alpha1_OrganizationSpec_To_v1beta1_OrganizationSpec(in, out, s)
+}
+
+func Convert_v1beta1_OrganizationSpec_To_v1alpha1_OrganizationSpec(in *v1beta1.OrganizationSpec, out *OrganizationSpec, s apiconversion.Scope) error {
+	out.CredentialsName = in.CredentialsRef.Name
+
+	return autoConvert_v1beta1_OrganizationSpec_To_v1alpha1_OrganizationSpec(in, out, s)
+}

api/v1alpha1/repository_conversion.go

@@ -0,0 +1,23 @@
+package v1alpha1
+
+import (
+	"github.com/mercedes-benz/garm-operator/api/v1beta1"
+	v1 "k8s.io/api/core/v1"
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+)
+
+func Convert_v1alpha1_RepositorySpec_To_v1beta1_RepositorySpec(in *RepositorySpec, out *v1beta1.RepositorySpec, s apiconversion.Scope) error {
+	out.CredentialsRef = v1.TypedLocalObjectReference{
+		Name:     in.CredentialsName,
+		Kind:     "GitHubCredentials",
+		APIGroup: &v1beta1.GroupVersion.Group,
+	}
+
+	return autoConvert_v1alpha1_RepositorySpec_To_v1beta1_RepositorySpec(in, out, s)
+}
+
+func Convert_v1beta1_RepositorySpec_To_v1alpha1_RepositorySpec(in *v1beta1.RepositorySpec, out *RepositorySpec, s apiconversion.Scope) error {
+	out.CredentialsName = in.CredentialsRef.Name
+
+	return autoConvert_v1beta1_RepositorySpec_To_v1alpha1_RepositorySpec(in, out, s)
+}