feat(): more verbosity
This commit is contained in:
		| @@ -27,13 +27,6 @@ func main() { | ||||
| 		internal.StartHealthEndpoint() | ||||
| 	}() | ||||
|  | ||||
| 	err = internal.RegisterCiliumCrd() | ||||
| 	if err != nil { | ||||
| 		log.WithFields(log.Fields{ | ||||
| 			"Caller": "Main", | ||||
| 		}).Fatal(fmt.Sprintf("Error registering Cilium CRD: %s", err.Error())) | ||||
| 	} | ||||
|  | ||||
| 	log.WithFields(log.Fields{ | ||||
| 		"Caller": "Main", | ||||
| 	}).Info("Entering main event loop") | ||||
|   | ||||
| @@ -6,10 +6,10 @@ import ( | ||||
| 	"fmt" | ||||
| 	"html/template" | ||||
|  | ||||
| 	log "github.com/sirupsen/logrus" | ||||
| 	"k8s.io/apimachinery/pkg/runtime/schema" | ||||
| 	"k8s.io/client-go/kubernetes/scheme" | ||||
| 	"k8s.io/client-go/rest" | ||||
| 	apiSchema "sigs.k8s.io/controller-runtime/pkg/scheme" | ||||
| ) | ||||
|  | ||||
| var CILIUM_GROUP_VERSION = schema.GroupVersion{ | ||||
| @@ -25,7 +25,7 @@ var IP_POOL_TEMPLATE = ` | ||||
|         "name": "{{ .Name }}", | ||||
|         "annotations": { | ||||
|             "argocd.argoproj.io/tracking-id": "cilium-lb:cilium.io/CiliumLoadBalancerIPPool:kube-system/covidnetes-pool", | ||||
| 			"managed-by": "canada-kaktus" | ||||
|             "managed-by": "canada-kaktus" | ||||
|         } | ||||
|     }, | ||||
|     "spec": { | ||||
| @@ -70,8 +70,18 @@ func RecreateIPPoolCrd(cfg *Config, name string, ips []string) error { | ||||
| 	var status int | ||||
| 	res.StatusCode(&status) | ||||
|  | ||||
| 	if status >= 200 && status <= 400 { | ||||
| 		return fmt.Errorf("failed to post CRD to kube api: %v", res.Error().Error()) | ||||
| 	if status < 200 || status >= 400 { | ||||
| 		return fmt.Errorf("failed to post CRD to kube api: %v", res.Error()) | ||||
| 	} | ||||
| 	raw, rawErr := res.Raw() | ||||
| 	log.WithFields(log.Fields{ | ||||
| 		"Caller": "RecreateIPPoolCrd", | ||||
| 	}).Infof("Response from k8s api server: %s", string(raw)) | ||||
|  | ||||
| 	if rawErr != nil { | ||||
| 		log.WithFields(log.Fields{ | ||||
| 			"Caller": "RecreateIPPoolCrd", | ||||
| 		}).Warnf("Could not get raw response from k8s api server: %v", rawErr) | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| @@ -113,11 +123,11 @@ func generateIpPool(name string, ips []string) (string, error) { | ||||
| 	return buf.String(), nil | ||||
| } | ||||
|  | ||||
| func RegisterCiliumCrd() error { | ||||
| 	SchemeBuilder := &apiSchema.Builder{GroupVersion: CILIUM_GROUP_VERSION} | ||||
| 	err := SchemeBuilder.AddToScheme(scheme.Scheme) | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("could not register cilium crd: %v", err.Error()) | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
| // func RegisterCiliumCrd() error { | ||||
| // 	SchemeBuilder := &apiSchema.Builder{GroupVersion: CILIUM_GROUP_VERSION} | ||||
| // 	err := SchemeBuilder.AddToScheme(scheme.Scheme) | ||||
| // 	if err != nil { | ||||
| // 		return fmt.Errorf("could not register cilium crd: %v", err.Error()) | ||||
| // 	} | ||||
| // 	return nil | ||||
| // } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user