Skip to content

Commit

Permalink
Code restructure initial -- not complete
Browse files Browse the repository at this point in the history
  • Loading branch information
@Starttoaster
Starttoaster committed Dec 8, 2023
1 parent dbb8bc5 commit ee82b58
Show file tree
Hide file tree
Showing 18 changed files with 780 additions and 472 deletions.
19 changes: 12 additions & 7 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/metrics/server"

k8schianetv1 "github.com/chia-network/chia-operator/api/v1"
"github.com/chia-network/chia-operator/internal/controller"
"github.com/chia-network/chia-operator/internal/controller/chiaca"
"github.com/chia-network/chia-operator/internal/controller/chiafarmer"
"github.com/chia-network/chia-operator/internal/controller/chiaharvester"
"github.com/chia-network/chia-operator/internal/controller/chianode"
"github.com/chia-network/chia-operator/internal/controller/chiatimelord"
"github.com/chia-network/chia-operator/internal/controller/chiawallet"
//+kubebuilder:scaffold:imports
)

Expand Down Expand Up @@ -77,42 +82,42 @@ func main() {
os.Exit(1)
}

if err = (&controller.ChiaNodeReconciler{
if err = (&chianode.ChiaNodeReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ChiaNode")
os.Exit(1)
}
if err = (&controller.ChiaFarmerReconciler{
if err = (&chiafarmer.ChiaFarmerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ChiaFarmer")
os.Exit(1)
}
if err = (&controller.ChiaHarvesterReconciler{
if err = (&chiaharvester.ChiaHarvesterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ChiaHarvester")
os.Exit(1)
}
if err = (&controller.ChiaCAReconciler{
if err = (&chiaca.ChiaCAReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ChiaCA")
os.Exit(1)
}
if err = (&controller.ChiaWalletReconciler{
if err = (&chiawallet.ChiaWalletReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ChiaWallet")
os.Exit(1)
}
if err = (&controller.ChiaTimelordReconciler{
if err = (&chiatimelord.ChiaTimelordReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
Expand Down
13 changes: 7 additions & 6 deletions internal/controller/chiaca_controller.go → internal/controller/chiaca/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Copyright 2023 Chia Network Inc.
*/

package controller
package chiaca

import (
"context"
Expand All @@ -22,6 +22,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

k8schianetv1 "github.com/chia-network/chia-operator/api/v1"
"github.com/chia-network/chia-operator/internal/controller/common"
"github.com/cisco-open/operator-tools/pkg/reconciler"
)

Expand Down Expand Up @@ -65,7 +66,7 @@ func (r *ChiaCAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr

// Reconcile resources, creating them if they don't exist
sa := r.assembleCAServiceAccount(ctx, ca)
res, err := reconcileServiceAccount(ctx, resourceReconciler, sa)
res, err := common.ReconcileServiceAccount(ctx, resourceReconciler, sa)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand All @@ -74,7 +75,7 @@ func (r *ChiaCAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
}

role := r.assembleCARole(ctx, ca)
res, err = reconcileRole(ctx, resourceReconciler, role)
res, err = common.ReconcileRole(ctx, resourceReconciler, role)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand All @@ -83,7 +84,7 @@ func (r *ChiaCAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
}

rb := r.assembleCARoleBinding(ctx, ca)
res, err = reconcileRoleBinding(ctx, resourceReconciler, rb)
res, err = common.ReconcileRoleBinding(ctx, resourceReconciler, rb)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand All @@ -100,7 +101,7 @@ func (r *ChiaCAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
// Create CA generating Job if Secret does not already exist
if notFound {
job := r.assembleCAJob(ctx, ca)
res, err = reconcileJob(ctx, resourceReconciler, job)
res, err = common.ReconcileJob(ctx, resourceReconciler, job)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand Down Expand Up @@ -268,7 +269,7 @@ func (r *ChiaCAReconciler) getCASecret(ctx context.Context, ca k8schianetv1.Chia
// getChiaCACommonLabels gives some common labels for ChiaCA related objects
func (r *ChiaCAReconciler) getChiaCACommonLabels(ctx context.Context, ca k8schianetv1.ChiaCA) map[string]string {
var labels map[string]string = make(map[string]string)
labels = getCommonLabels(ctx, labels)
labels = common.GetCommonLabels(ctx, labels)
labels["app.kubernetes.io/instance"] = ca.Name
labels["chiaca-owner"] = ca.Name
return labels
Expand Down
66 changes: 0 additions & 66 deletions internal/controller/chiaca_controller_test.go
View file

This file was deleted.

23 changes: 12 additions & 11 deletions internal/controller/chiafarmer_controller.go → internal/controller/chiafarmer/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Copyright 2023 Chia Network Inc.
*/

package controller
package chiafarmer

import (
"context"
Expand All @@ -20,6 +20,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

k8schianetv1 "github.com/chia-network/chia-operator/api/v1"
"github.com/chia-network/chia-operator/internal/controller/common"
"github.com/cisco-open/operator-tools/pkg/reconciler"
)

Expand Down Expand Up @@ -64,7 +65,7 @@ func (r *ChiaFarmerReconciler) Reconcile(ctx context.Context, req ctrl.Request)

// Reconcile ChiaFarmer owned objects
srv := r.assembleBaseService(ctx, farmer)
res, err := reconcileService(ctx, resourceReconciler, srv)
res, err := common.ReconcileService(ctx, resourceReconciler, srv)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand All @@ -73,7 +74,7 @@ func (r *ChiaFarmerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}

srv = r.assembleChiaExporterService(ctx, farmer)
res, err = reconcileService(ctx, resourceReconciler, srv)
res, err = common.ReconcileService(ctx, resourceReconciler, srv)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand All @@ -82,7 +83,7 @@ func (r *ChiaFarmerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}

deploy := r.assembleDeployment(ctx, farmer)
res, err = reconcileDeployment(ctx, resourceReconciler, deploy)
res, err = common.ReconcileDeployment(ctx, resourceReconciler, deploy)
if err != nil {
if res == nil {
res = &reconcile.Result{}
Expand Down Expand Up @@ -122,7 +123,7 @@ func (r *ChiaFarmerReconciler) assembleBaseService(ctx context.Context, farmer k
Type: corev1.ServiceType(farmer.Spec.ServiceType),
Ports: []corev1.ServicePort{
{
Port: daemonPort,
Port: common.DaemonPort,
TargetPort: intstr.FromString("daemon"),
Protocol: "TCP",
Name: "daemon",
Expand Down Expand Up @@ -159,7 +160,7 @@ func (r *ChiaFarmerReconciler) assembleChiaExporterService(ctx context.Context,
Type: corev1.ServiceType("ClusterIP"),
Ports: []corev1.ServicePort{
{
Port: chiaExporterPort,
Port: common.ChiaExporterPort,
TargetPort: intstr.FromString("metrics"),
Protocol: "TCP",
Name: "metrics",
Expand Down Expand Up @@ -204,7 +205,7 @@ func (r *ChiaFarmerReconciler) assembleDeployment(ctx context.Context, farmer k8

var chiaExporterImage = farmer.Spec.ChiaExporterConfig.Image
if chiaExporterImage == "" {
chiaExporterImage = defaultChiaExporterImage
chiaExporterImage = common.DefaultChiaExporterImage
}

var deploy appsv1.Deployment = appsv1.Deployment{
Expand Down Expand Up @@ -236,7 +237,7 @@ func (r *ChiaFarmerReconciler) assembleDeployment(ctx context.Context, farmer k8
Ports: []corev1.ContainerPort{
{
Name: "daemon",
ContainerPort: daemonPort,
ContainerPort: common.DaemonPort,
Protocol: "TCP",
},
{
Expand Down Expand Up @@ -277,7 +278,7 @@ func (r *ChiaFarmerReconciler) assembleDeployment(ctx context.Context, farmer k8
},
}

exporterContainer := getChiaExporterContainer(ctx, chiaExporterImage, chiaSecContext, imagePullPolicy, chiaResources)
exporterContainer := common.GetChiaExporterContainer(ctx, chiaExporterImage, chiaSecContext, imagePullPolicy, chiaResources)
deploy.Spec.Template.Spec.Containers = append(deploy.Spec.Template.Spec.Containers, exporterContainer)

if farmer.Spec.PodSecurityContext != nil {
Expand Down Expand Up @@ -422,7 +423,7 @@ func (r *ChiaFarmerReconciler) getCommonLabels(ctx context.Context, farmer k8sch
}
labels["app.kubernetes.io/instance"] = farmer.Name
labels["chiafarmer-owner"] = farmer.Name
labels = getCommonLabels(ctx, labels)
labels = common.GetCommonLabels(ctx, labels)
return labels
}

Expand All @@ -434,7 +435,7 @@ func (r *ChiaFarmerReconciler) getOwnerReference(ctx context.Context, farmer k8s
Kind: farmer.Kind,
Name: farmer.Name,
UID: farmer.UID,
Controller: &controllerOwner,
Controller: &common.ControllerOwner,
},
}
}
Loading

0 comments on commit ee82b58

Please sign in to comment.