envs from secret, new detection rules

Author: shcherbak

VERSION.txt

@@ -1 +1 @@
-0.2.3
+0.2.4

charts/keepup-helm-scraper/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: keepup-helm-scraper
 description: A Helm chart for scrape charts release information.
 type: application
-version: 0.3.6
-appVersion: 0.2.3
+version: 0.4.0
+appVersion: 0.2.4

charts/keepup-helm-scraper/templates/configmap.yaml

@@ -49,6 +49,38 @@ data:
       detectionRegex: 'docker\.elastic\.co\/elasticsearch\/elasticsearch:'
       versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
 
+    - applicationName: 'kibana'
+      detectionRegex: 'docker\.elastic\.co\/kibana\/kibana:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
     - applicationName: 'synapse'
-      detectionRegex: 'ghcr\.io\/code-tool\/matrix-stack/synapse:'
+      detectionRegex: 'ghcr\.io\/code-tool\/matrix-stack\/synapse:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
+    - applicationName: 'authentik'
+      detectionRegex: 'ghcr\.io\/goauthentik\/server:'
+      versionRegex: ':(\d+)\.(\d+)\.(\d+)$'
+
+    - applicationName: 'argocd'
+      detectionRegex: 'quay\.io\/argoproj\/argocd:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
+    - applicationName: 'grafana'
+      detectionRegex: 'docker\.io\/grafana\/grafana:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
+    - applicationName: 'flux-operator'
+      detectionRegex: 'ghcr\.io\/controlplaneio-fluxcd\/flux-operator:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
+    - applicationName: 'vaultwarden'
+      detectionRegex: 'docker\.io\/vaultwarden\/server:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
+    - applicationName: 'openbao'
+      detectionRegex: 'quay\.io\/openbao\/openbao:'
+      versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
+
+    - applicationName: 'metallb'
+      detectionRegex: 'quay\.io\/metallb\/controller:'
       versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'

charts/keepup-helm-scraper/templates/cronjob.yaml

@@ -18,11 +18,9 @@ spec:
             - name: helm-scraper
               image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
               imagePullPolicy: "{{ .Values.image.pullPolicy }}"
-              env:
-              {{- range $name, $value := .Values.env }}
-                - name: {{ $name }}
-                  value: {{ $value }}
-              {{- end }}
+              envFrom:
+                - secretRef:
+                    name: {{ .Release.Name }}
               volumeMounts:
                 - name: config
                   mountPath: "{{ .Values.env.RULES_FILE }}"

charts/keepup-helm-scraper/templates/secret.yaml

@@ -0,0 +1,8 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}
+data:
+{{- range $k, $v := .Values.env }}
+  {{ $k }}: {{ $v | toString | b64enc }}
+{{- end }}

go.mod

@@ -1,4 +1,4 @@
-module keepup-helm-scrapper
+module keepup-helm-scraper
 
 go 1.25.0
 

src/config/env.go

@@ -26,7 +26,7 @@ func loadEnvFile() {
 	log.Println("Loading .env file.")
 	err := godotenv.Load(".env")
 	if err != nil {
-		panic("Error loading .env file.")
+		log.Fatalf("Error loading .env file: %v", err)
 	}
 }
 
@@ -46,7 +46,7 @@ func init() {
 		envName := refl.Type().Field(i).Name
 		envVal, foud := os.LookupEnv(envName)
 		if !foud {
-			panic("Environment [" + envName + "] not found.")
+			log.Fatalf("Environment not found: %v", envName)
 		}
 		refl.Field(i).SetString(envVal)
 	}

src/main.go

@@ -5,12 +5,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"keepup-helm-scrapper/src/config"
-	"keepup-helm-scrapper/src/rules"
+	"keepup-helm-scraper/src/config"
+	"keepup-helm-scraper/src/rules"
 	"log"
 	"net/http"
 	"os"
 	"regexp"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,7 +34,6 @@ type ClusterInfo struct {
 func main() {
 	ctx := context.Background()
 
-	//kubeconfig, err := clientcmd.BuildConfigFromFlags("", "/home/.kube/minikube.cfg")
 	kubeconfig, err := rest.InClusterConfig()
 	if err != nil {
 		log.Fatalf("failed to get cluster config: %v", err)
@@ -51,7 +51,7 @@ func main() {
 
 	var versionRe = regexp.MustCompile(`(\d+)\.(\d+)(\.\d+)?`)
 
-	imagesByNs, err := CollectNamespaceImages(ctx, clientset)
+	imagesByNs, err := сollectNamespaceImages(ctx, clientset)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -104,7 +104,7 @@ func main() {
 	sendDataToAPI(jsonData)
 }
 
-func CollectNamespaceImages(
+func сollectNamespaceImages(
 	ctx context.Context,
 	client kubernetes.Interface,
 ) (map[string][]string, error) {
@@ -246,7 +246,7 @@ func sendDataToAPI(jsonData []byte) {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("x-api-token", apiToken)
 
-	client := &http.Client{}
+	client := &http.Client{Timeout: 30 * time.Second}
 	resp, err := client.Do(req)
 	if err != nil {
 		log.Printf("Failed to send data to API: %v", err)