Add constants for kind names

This commit is contained in:
Hidde Beydals 2020-07-10 12:07:54 +02:00
parent 9592196300
commit c90be06345
5 changed files with 15 additions and 9 deletions

View File

@ -23,6 +23,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
const GitRepositoryKind = "GitRepository"
// GitRepositorySpec defines the desired state of a Git repository.
type GitRepositorySpec struct {
// The repository URL, can be a HTTP or SSH address.

View File

@ -21,6 +21,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
const HelmChartKind = "HelmChart"
// HelmChartSpec defines the desired state of a Helm chart.
type HelmChartSpec struct {
// The name of the Helm chart, as made available by the referenced

View File

@ -21,6 +21,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
const HelmRepositoryKind = "HelmRepository"
// HelmRepositorySpec defines the reference to a Helm repository.
type HelmRepositorySpec struct {
// The Helm repository URL, a valid URL contains at least a

View File

@ -107,7 +107,7 @@ var _ = BeforeSuite(func(done Done) {
err = (&GitRepositoryReconciler{
Client: k8sManager.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("GitRepository"),
Log: ctrl.Log.WithName("controllers").WithName(sourcev1.GitRepositoryKind),
Scheme: scheme.Scheme,
Storage: storage,
}).SetupWithManager(k8sManager)
@ -115,7 +115,7 @@ var _ = BeforeSuite(func(done Done) {
err = (&HelmRepositoryReconciler{
Client: k8sManager.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("HelmRepository"),
Log: ctrl.Log.WithName("controllers").WithName(sourcev1.HelmRepositoryKind),
Scheme: scheme.Scheme,
Storage: storage,
Getters: getter.Providers{getter.Provider{
@ -127,7 +127,7 @@ var _ = BeforeSuite(func(done Done) {
err = (&HelmChartReconciler{
Client: k8sManager.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("HelmChart"),
Log: ctrl.Log.WithName("controllers").WithName(sourcev1.HelmChartKind),
Scheme: scheme.Scheme,
Storage: storage,
Getters: getter.Providers{getter.Provider{

12
main.go
View File

@ -112,7 +112,7 @@ func main() {
if err = (&controllers.GitRepositoryReconciler{
Client: mgr.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("GitRepository"),
Log: ctrl.Log.WithName("controllers").WithName(sourcev1.GitRepositoryKind),
Scheme: mgr.GetScheme(),
Storage: storage,
EventRecorder: mgr.GetEventRecorderFor("source-controller"),
@ -120,12 +120,12 @@ func main() {
}).SetupWithManagerAndOptions(mgr, controllers.GitRepositoryReconcilerOptions{
MaxConcurrentReconciles: concurrent,
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "GitRepository")
setupLog.Error(err, "unable to create controller", "controller", sourcev1.GitRepositoryKind)
os.Exit(1)
}
if err = (&controllers.HelmRepositoryReconciler{
Client: mgr.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("HelmRepository"),
Log: ctrl.Log.WithName("controllers").WithName(sourcev1.HelmRepositoryKind),
Scheme: mgr.GetScheme(),
Storage: storage,
Getters: getters,
@ -134,12 +134,12 @@ func main() {
}).SetupWithManagerAndOptions(mgr, controllers.HelmRepositoryReconcilerOptions{
MaxConcurrentReconciles: concurrent,
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "HelmRepository")
setupLog.Error(err, "unable to create controller", "controller", sourcev1.HelmRepositoryKind)
os.Exit(1)
}
if err = (&controllers.HelmChartReconciler{
Client: mgr.GetClient(),
Log: ctrl.Log.WithName("controllers").WithName("HelmChart"),
Log: ctrl.Log.WithName("controllers").WithName(sourcev1.HelmChartKind),
Scheme: mgr.GetScheme(),
Storage: storage,
Getters: getters,
@ -148,7 +148,7 @@ func main() {
}).SetupWithManagerAndOptions(mgr, controllers.HelmChartReconcilerOptions{
MaxConcurrentReconciles: concurrent,
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "HelmChart")
setupLog.Error(err, "unable to create controller", "controller", sourcev1.HelmChartKind)
os.Exit(1)
}
// +kubebuilder:scaffold:builder