Feat/upgrade

.drone.yml

@@ -8,7 +8,7 @@ steps:
   settings:
     auto_tag: true
     dockerfile: Dockerfile
-    repo: grafana/kubernetes-diff-logger
+    repo: muandane/differ
     tags: latest
     password:
       from_secret: docker_password

.gitignore

@@ -1 +1,4 @@
 kubernetes-diff-logger
+.vscode
+.DS_Store
+.env

Dockerfile

@@ -1,17 +1,16 @@
-FROM golang:1.16 as build
+FROM golang:1.24-alpine3.21 AS build
 WORKDIR /src
 
 COPY . .
-RUN go mod download && \
-    CGO_ENABLED=0 GOOS=linux go build -a -o app .
+RUN go mod download -x && CGO_ENABLED=0 go build -ldflags="-s -w" -o differ .
 
-FROM alpine:latest 
+FROM alpine:3.21.3 
 
 RUN addgroup -g 1000 app && \
     adduser -u 1000 -h /app -G app -S app
 WORKDIR /app
 USER app
 
-COPY --from=build /src/app .
+COPY --from=build /src/differ .
 
-CMD ["./app"] 
+CMD ["./differ"] 

Makefile

@@ -2,4 +2,4 @@
 
 drone:
 	drone lint
-	drone --server https://drone.grafana.net sign --save grafana/kubernetes-diff-logger
+	drone --server https://drone.grafana.net sign --save muandane/differ

config.go

@@ -3,6 +3,11 @@ package main
 // Config represents the configuration options for kubernetes-diff-logger
 type Config struct {
 	Differs []DifferConfig `yaml:"differs"`
+	Metrics MetricsConfig  `yaml:"metrics"`
+}
+type MetricsConfig struct {
+	Enabled bool   `yaml:"enabled"`
+	Port    string `yaml:"port"`
 }
 
 // DifferConfig represents the configuration options for a single Diffing process
@@ -17,10 +22,14 @@ type DifferConfig struct {
 func DefaultConfig() Config {
 	return Config{
 		Differs: []DifferConfig{
-			DifferConfig{
+			{
 				NameFilter: "*",
 				Type:       "deployment",
 			},
 		},
+		Metrics: MetricsConfig{
+			Enabled: true,
+			Port:    "2112",
+		},
 	}
 }

deployment/configmap.yaml

@@ -14,3 +14,8 @@ data:
       type: "daemonset"
     - nameFilter: "*"
       type: "cronjob"
+    - nameFilter: "*"
+      type: "configMap"
+    metrics:
+      enabled: true
+      port: "2112"

deployment/deployment.yaml

@@ -18,21 +18,36 @@ spec:
       containers:
       - name: kube-diff-logger
         command:
-        - /app/app
+        - ./differ
         - -config=/etc/kube-diff-logger/config.yml
-        image: grafana/kubernetes-diff-logger:latest       
+        image: muandane/differ:0.0.1
+        imagePullPolicy: Always
         resources:
           limits:
             cpu: 100m
             memory: 100Mi
           requests:
             cpu: 50m
             memory: 50Mi
+        ports:
+        - containerPort: 2112
+          name: metrics
         volumeMounts:
         - mountPath: /etc/kube-diff-logger
           name: kube-diff-logger
       serviceAccountName: kube-diff-logger
       volumes:
       - configMap:
           name: kube-diff-logger
-        name: kube-diff-logger
+        name: kube-diff-logger
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kube-diff-logger
+spec:
+  selector:
+    name: kube-diff-logger
+  ports:
+  - port: 2112
+    targetPort: metrics

deployment/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- configmap.yaml
+- deployment.yaml
+- rbac.yaml

deployment/rbac.yaml

@@ -4,16 +4,13 @@ metadata:
   name: kube-diff-logger
 rules:
 - apiGroups:
-  - apps
-  - batch
+  - "*"
   resources:
-  - daemonsets
-  - deployments
-  - statefulsets
-  - cronjobs
+  - "*"
   verbs:
   - list
   - watch
+  - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

go.mod

@@ -1,28 +1,61 @@
-module github.com/grafana/kubernetes-diff-logger
+module github.com/muandane/differ
 
-go 1.16
+go 1.24
 
 require (
 	github.com/apex/log v1.9.0
-	github.com/go-test/deep v1.0.7
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/go-test/deep v1.1.1
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.21.0
 	github.com/ryanuber/go-glob v1.0.0
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1 // indirect
-	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.21.2
-	k8s.io/apimachinery v0.21.2
-	k8s.io/client-go v0.21.2
-	k8s.io/klog/v2 v2.9.0 // indirect
-	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
+	k8s.io/api v0.32.2
+	k8s.io/apimachinery v0.32.2
+	k8s.io/client-go v0.32.2
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/oauth2 v0.26.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/term v0.29.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
+	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )