annotations for yaml reference in a git repository to open automatic requests pr

.github/workflows/lint.yml

@@ -1,6 +1,6 @@
 name: golangci-lint
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   golangci:
@@ -22,7 +22,9 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50.0
-          args: -c .golang-ci.yml -v --timeout=5m
+          version: latest
+          args: --timeout=10m
+          skip-pkg-cache: true
+          skip-build-cache: true
         env:
           GO111MODULES: off

.github/workflows/test.yml

@@ -1,34 +1,34 @@
-name: Test and coverage
+# name: Test and coverage
 
-on: [push, pull_request]
+# on: [pull_request]
 
-jobs:
-  test:
-    strategy:
-      matrix:
-        go-version: [1.19.x]
-        os: [ubuntu-latest, macos-latest]
+# jobs:
+#   test:
+#     strategy:
+#       matrix:
+#         go-version: [1.19.x]
+#         os: [ubuntu-latest, macos-latest]
 
-    runs-on: ${{ matrix.os }}
+#     runs-on: ${{ matrix.os }}
 
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
+#     steps:
+#       - uses: actions/checkout@v3
+#         with:
+#           fetch-depth: 2
 
-      - uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
+#       - uses: actions/setup-go@v2
+#         with:
+#           go-version: ${{ matrix.go-version }}
 
-      - name: go get
-        run: go get ./...
+#       - name: go get
+#         run: go get ./...
 
-      - name: go mod tidy
-        run: go mod tidy
+#       - name: go mod tidy
+#         run: go mod tidy
 
-      - name: Run coverage
-        run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
+#       - name: Run coverage
+#         run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
 
-      - name: Upload coverage to Codecov
-        if: matrix.os == 'ubuntu-latest'
-        run: bash <(curl -s https://codecov.io/bash)
+#       - name: Upload coverage to Codecov
+#         if: matrix.os == 'ubuntu-latest'
+#         run: bash <(curl -s https://codecov.io/bash)

charts/kube-reqsizer/templates/deployment.yaml

@@ -27,6 +27,8 @@ spec:
         - --metrics-bind-address=:8080
         - --leader-elect
         - --annotation-filter={{.Values.enabledAnnotation}}
+        - --github-mode={{.Values.githubMode.enabled}}
+        - --verbose-mode={{.Values.verboseMode}}
         - --sample-size={{.Values.sampleSize}}
         - --min-seconds={{.Values.minSeconds}}
         - --zap-log-level={{.Values.logLevel}}
@@ -52,6 +54,8 @@ spec:
         env:
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ .Values.kubernetesClusterDomain }}
+        - name: GITHUB_TOKEN
+          value: {{ .Values.githubMode.token }}
         ports:
         - name: metrics
           containerPort: {{ .Values.metricsService.port }}

charts/kube-reqsizer/values.yaml

@@ -1,4 +1,8 @@
 enabledAnnotation: true
+githubMode: 
+  enabled: false
+  token: ghp_abc123
+verboseMode: false
 sampleSize: 1
 minSeconds: 1
 enableIncrease: true

controllers/pod_controller.go

@@ -25,9 +25,11 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/jatalocks/kube-reqsizer/pkg/cache/localcache"
 	"github.com/jatalocks/kube-reqsizer/pkg/cache/rediscache"
+
+	"github.com/jatalocks/kube-reqsizer/pkg/git"
 	"github.com/jatalocks/kube-reqsizer/types"
 	"github.com/prometheus/client_golang/prometheus"
-	corev1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1" // nolint:all
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -65,6 +67,8 @@ type PodReconciler struct {
 	MemoryFactor                float64
 	RedisClient                 rediscache.RedisClient
 	EnablePersistence           bool
+	GithubMode                  bool
+	VerboseMode                 bool
 }
 
 const (
@@ -164,10 +168,14 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 			SumPodRequest.Sample = 0
 			log.Info(fmt.Sprint("Adding cache sample ", SumPodRequest.Sample))
 			if r.EnablePersistence {
-				r.RedisClient.AddToCache(SumPodRequest)
+				if err := r.RedisClient.AddToCache(SumPodRequest); err != nil {
+					log.Error(err, err.Error())
+				}
 				log.Info(fmt.Sprint("Items in Cache: ", r.RedisClient.CacheSize()))
 			} else {
-				localcache.AddToCache(cacheStore, SumPodRequest)
+				if err := localcache.AddToCache(cacheStore, SumPodRequest); err != nil {
+					log.Error(err, err.Error())
+				}
 				log.Info(fmt.Sprint("Items in Cache: ", len(cacheStore.List())))
 			}
 		} else {
@@ -208,14 +216,14 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 				if err := r.RedisClient.DeleteFromCache(LatestPodRequest); err != nil {
 					log.Error(err, err.Error())
 				}
-				if err = r.RedisClient.AddToCache(SumPodRequest); err != nil {
+				if err := r.RedisClient.AddToCache(SumPodRequest); err != nil {
 					log.Error(err, err.Error())
 				}
 			} else {
 				if err := localcache.DeleteFromCache(cacheStore, LatestPodRequest); err != nil {
 					log.Error(err, err.Error())
 				}
-				if err = localcache.AddToCache(cacheStore, SumPodRequest); err != nil {
+				if err := localcache.AddToCache(cacheStore, SumPodRequest); err != nil {
 					log.Error(err, err.Error())
 				}
 			}
@@ -309,14 +317,26 @@ func (r *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 					return r.UpdateKubeObject(&pod, ctx)
 				}
 
-				err, podSpec, deployment, _ := r.GetPodParentKind(pod, ctx)
+				podSpec, deployment, _, err := r.GetPodParentKind(pod, ctx)
 				if err != nil {
 					return ctrl.Result{}, err
 				}
-
-				UpdatePodController(podSpec, Requests, ctx)
-
-				return r.UpdateKubeObject(deployment.(client.Object), ctx)
+				if !r.VerboseMode {
+					UpdatePodController(podSpec, Requests, ctx)
+					return r.UpdateKubeObject(deployment.(client.Object), ctx)
+				}
+				if r.GithubMode {
+					path, pathExists := pod.Annotations["reqsizer.jatalocks.github.io/github.path"]
+					repo, repoExists := pod.Annotations["reqsizer.jatalocks.github.io/github.repo"]
+					owner, ownerExists := pod.Annotations["reqsizer.jatalocks.github.io/github.owner"]
+					if pathExists && repoExists && ownerExists {
+						if err := git.UpdateContainerRequestsInFile(path, Requests, repo, owner); err != nil {
+							log.Error(err, err.Error())
+						}
+					}
+				} else {
+					log.Info("Pod is missing github annotations")
+				}
 			}
 		}
 	}

controllers/pod_controller_functions.go

@@ -4,14 +4,16 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
 	"unicode/utf8"
 
 	"github.com/jatalocks/kube-reqsizer/types"
 	"github.com/labstack/gommon/log"
-	corev1 "k8s.io/api/core/v1"
+
+	corev1 "k8s.io/api/core/v1" // nolint:all
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -171,28 +173,31 @@ func GetPodRequests(pod corev1.Pod) types.PodRequests {
 		}
 		containerData = append(containerData, types.ContainerRequests{Name: c.Name, CPU: int64(nanoCores), Memory: int64(miMemory)})
 	}
-	return types.PodRequests{pod.Name, pod.Namespace, containerData, 0}
+	return types.PodRequests{Name: pod.Name, Namespace: pod.Namespace, ContainerRequests: containerData, Sample: 0}
 }
 
 func GeneratePodRequestsObjectFromRestData(restData []byte) types.PodRequests {
 	s := restData[:]
 	data := types.PodMetricsRestData{}
-	json.Unmarshal([]byte(s), &data)
+	err := json.Unmarshal([]byte(s), &data)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
 	containerData := []types.ContainerRequests{}
 	for _, c := range data.Containers {
 		nanoCores, _ := strconv.Atoi(RemoveLastChar(c.Usage.CPU))
 		kiMemory, _ := strconv.Atoi(strings.ReplaceAll(c.Usage.Memory, "Ki", ""))
 		containerData = append(containerData, types.ContainerRequests{Name: c.Name, CPU: int64(nanoCores / 1000000), Memory: int64(kiMemory / 1000)})
 	}
-	return types.PodRequests{data.Metadata.Name, data.Metadata.Namespace, containerData, 0}
+	return types.PodRequests{Name: data.Metadata.Name, Namespace: data.Metadata.Namespace, ContainerRequests: containerData, Sample: 0}
 }
 
 func (r *PodReconciler) MinimumUptimeOfPodInParent(pod corev1.Pod, ctx context.Context) bool {
 
 	if len(pod.OwnerReferences) == 0 {
 		return time.Since(pod.CreationTimestamp.Time).Seconds() >= r.MinSecondsBetweenPodRestart
 	}
-	err, _, _, deploymentName := r.GetPodParentKind(pod, ctx)
+	_, _, deploymentName, err := r.GetPodParentKind(pod, ctx)
 	if err != nil {
 		log.Error(err)
 		return false
@@ -216,32 +221,32 @@ func (r *PodReconciler) MinimumUptimeOfPodInParent(pod corev1.Pod, ctx context.C
 	return overAllLength != 0
 }
 
-func (r *PodReconciler) GetPodParentKind(pod corev1.Pod, ctx context.Context) (error, *v1.PodSpec, interface{}, string) {
+func (r *PodReconciler) GetPodParentKind(pod corev1.Pod, ctx context.Context) (*v1.PodSpec, interface{}, string, error) {
 	if len(pod.OwnerReferences) > 0 {
 		switch pod.OwnerReferences[0].Kind {
 		case "ReplicaSet":
 			replica, err := r.ClientSet.AppsV1().ReplicaSets(pod.Namespace).Get(ctx, pod.OwnerReferences[0].Name, metav1.GetOptions{})
 			if err != nil {
 				log.Error(err, err.Error())
-				return err, nil, nil, ""
+				return nil, nil, "", err
 			}
 			deployment, err := r.ClientSet.AppsV1().Deployments(pod.Namespace).Get(ctx, replica.OwnerReferences[0].Name, metav1.GetOptions{})
 			if replica.OwnerReferences[0].Kind == "Deployment" {
-				return err, &deployment.Spec.Template.Spec, deployment, deployment.Name
+				return &deployment.Spec.Template.Spec, deployment, deployment.Name, err
 			} else {
-				return errors.New("Is Owned by Unknown CRD"), nil, nil, ""
+				return nil, nil, "", errors.New("is Owned by Unknown CRD")
 			}
 		case "DaemonSet":
 			deployment, err := r.ClientSet.AppsV1().DaemonSets(pod.Namespace).Get(ctx, pod.OwnerReferences[0].Name, metav1.GetOptions{})
-			return err, &deployment.Spec.Template.Spec, deployment, deployment.Name
+			return &deployment.Spec.Template.Spec, deployment, deployment.Name, err
 		case "StatefulSet":
 			deployment, err := r.ClientSet.AppsV1().StatefulSets(pod.Namespace).Get(ctx, pod.OwnerReferences[0].Name, metav1.GetOptions{})
-			return err, &deployment.Spec.Template.Spec, deployment, deployment.Name
+			return &deployment.Spec.Template.Spec, deployment, deployment.Name, err
 		default:
-			return errors.New("Is Owned by Unknown CRD"), nil, nil, ""
+			return nil, nil, "", errors.New("is Owned by Unknown CRD")
 		}
 	} else {
-		return errors.New("Pod Has No Owner"), nil, nil, ""
+		return nil, nil, "", errors.New("pod Has No Owner")
 	}
 }
 

go.mod

@@ -5,14 +5,20 @@ go 1.19
 require (
 	github.com/go-logr/logr v1.2.3
 	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/google/go-github/v50 v50.2.0
 	github.com/labstack/gommon v0.4.0
 	k8s.io/api v0.25.0
 	k8s.io/apimachinery v0.26.0
 	k8s.io/client-go v0.25.0
-	k8s.io/klog v1.0.0
 	sigs.k8s.io/controller-runtime v0.13.1
 )
 
+require (
+	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
+	github.com/cloudflare/circl v1.1.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+)
+
 require (
 	cloud.google.com/go v0.97.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -39,6 +45,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-github/v50 v50.2.0
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
@@ -52,7 +59,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.12.2 // indirect
+	github.com/prometheus/client_golang v1.12.2
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
@@ -62,19 +69,19 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
-	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/term v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/oauth2 v0.6.0
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/apiextensions-apiserver v0.25.0 // indirect
 	k8s.io/component-base v0.25.0 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect