Merge pull request #1173 from kuberhealthy/cleanup

Release 2.8.0
kuberhealthy · Dec 23, 2023 · 6c9dac2 · 6c9dac2
2 parents 9d2e6ed + cf4830d
commit 6c9dac2
Show file tree

Hide file tree

Showing 60 changed files with 578 additions and 514 deletions.
diff --git a/.github/workflows/gosec-latest-checks.yaml b/.github/workflows/gosec-latest-checks.yaml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,55 @@
+name: Build and Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+
+    - name: Extract tag name
+      run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: cmd/kuberhealthy/Dockerfile
+        push: true
+        tags: kuberhealthy/kuberhealthy:${{ env.TAG }}
+        platforms: linux/amd64,linux/arm64
+
+  create-release:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    steps:
+    - name: Create Release
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: ${{ github.ref }}
+        generate_release_notes: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/cmd/ami-check/Makefile b/cmd/ami-check/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-ami-check"
 IMAGE := "kuberhealthy/ami-check"
-TAG := "v1.4.0"
+TAG := "v1.4.1"
diff --git a/cmd/ami-check/ami-check.yaml b/cmd/ami-check/ami-check.yaml
@@ -12,7 +12,7 @@ spec:
   podSpec:
     containers:
       - name: ami
-        image: kuberhealthy/ami-check:v1.4.0
+        image: kuberhealthy/ami-check:v1.4.1
         imagePullPolicy: IfNotPresent
         env:
           - name: AWS_REGION

diff --git a/cmd/cronjob-checker/Makefile b/cmd/cronjob-checker/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-cronjob-checker"
 IMAGE := "kuberhealthy/cronjob-checker"
-TAG := "v2.1.0"
+TAG := "v2.1.1"
diff --git a/cmd/cronjob-checker/cronjob-checker.yaml b/cmd/cronjob-checker/cronjob-checker.yaml
@@ -9,7 +9,7 @@ spec:
     serviceAccountName: cronjob-checker
     containers:
       - name: cronjob-checker
-        image: kuberhealthy/cronjob-checker:v2.1.0
+        image: kuberhealthy/cronjob-checker:v2.1.1
         imagePullPolicy: IfNotPresent
         env:
           - name: NAMESPACE

diff --git a/cmd/daemonset-check/Makefile b/cmd/daemonset-check/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-daemonset-check"
 IMAGE := "kuberhealthy/daemonset-check"
-TAG := "v3.3.0"
+TAG := "v3.3.1"
diff --git a/cmd/daemonset-check/daemonset-check.yaml b/cmd/daemonset-check/daemonset-check.yaml
@@ -17,7 +17,7 @@ spec:
           #  value: "kubernetes.io/hostname=test"
           #- name: NODE_SELECTOR
           #  value: "kubernetes.io/hostname=test"
-        image: kuberhealthy/daemonset-check:v3.3.0
+        image: kuberhealthy/daemonset-check:v3.3.1
         imagePullPolicy: IfNotPresent
         name: main
         resources:

diff --git a/cmd/deployment-check/Makefile b/cmd/deployment-check/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-deployment-check"
 IMAGE := "kuberhealthy/deployment-check"
-TAG := "v1.9.0"
+TAG := "v1.9.1"
diff --git a/cmd/deployment-check/deployment-check.yaml b/cmd/deployment-check/deployment-check.yaml
@@ -10,7 +10,7 @@ spec:
   podSpec:
     containers:
       - name: deployment
-        image: kuberhealthy/deployment-check:v1.9.0
+        image: kuberhealthy/deployment-check:v1.9.1
         imagePullPolicy: IfNotPresent
         env:
           - name: CHECK_DEPLOYMENT_REPLICAS

diff --git a/cmd/deployment-check/deployment.go b/cmd/deployment-check/deployment.go
@@ -322,22 +322,16 @@ func createContainerConfig(imageURL string) corev1.Container {
 	}
 
 	// Make a TCP socket for the probe handler.
-	tcpSocket := corev1.TCPSocketAction{
-		Port: intstr.IntOrString{
-			IntVal: checkContainerPort,
-			StrVal: strconv.Itoa(int(checkContainerPort)),
-		},
-	}
-
-	// Make a handler for the probes.
-	handler := corev1.Handler{
-		TCPSocket: &tcpSocket,
-	}
+	// tcpSocket := corev1.TCPSocketAction{
+	// 	Port: intstr.IntOrString{
+	// 		IntVal: checkContainerPort,
+	// 		StrVal: strconv.Itoa(int(checkContainerPort)),
+	// 	},
+	// }
 
 	// Make liveness and readiness probes.
 	// Make the liveness probe here.
 	liveProbe := corev1.Probe{
-		Handler:             handler,
 		InitialDelaySeconds: defaultProbeInitialDelaySeconds,
 		TimeoutSeconds:      defaultProbeTimeoutSeconds,
 		PeriodSeconds:       defaultProbePeriodSeconds,
@@ -347,7 +341,6 @@ func createContainerConfig(imageURL string) corev1.Container {
 
 	// Make the readiness probe here.
 	readyProbe := corev1.Probe{
-		Handler:             handler,
 		InitialDelaySeconds: defaultProbeInitialDelaySeconds,
 		TimeoutSeconds:      defaultProbeTimeoutSeconds,
 		PeriodSeconds:       defaultProbePeriodSeconds,

diff --git a/cmd/dns-resolution-check/Makefile b/cmd/dns-resolution-check/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-dns-resolution-check"
 IMAGE := "kuberhealthy/dns-resolution-check"
-TAG := "v1.5.0"
+TAG := "v1.5.1"
diff --git a/cmd/dns-resolution-check/externalDNSStatusCheck.yaml b/cmd/dns-resolution-check/externalDNSStatusCheck.yaml
@@ -15,7 +15,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: kuberhealthy/dns-resolution-check:v1.5.0
+        image: kuberhealthy/dns-resolution-check:v1.5.1
         imagePullPolicy: IfNotPresent
         name: main
         resources:

diff --git a/cmd/dns-resolution-check/internalDNSStatusCheck.yaml b/cmd/dns-resolution-check/internalDNSStatusCheck.yaml
@@ -19,7 +19,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-        image: kuberhealthy/dns-resolution-check:v1.5.0
+        image: kuberhealthy/dns-resolution-check:v1.5.1
         imagePullPolicy: IfNotPresent
         name: main
         resources:

diff --git a/cmd/http-check/Makefile b/cmd/http-check/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-http-check"
 IMAGE := "kuberhealthy/http-check"
-TAG := "v1.5.0"
+TAG := "v1.5.1"
diff --git a/cmd/http-check/http-check.yaml b/cmd/http-check/http-check.yaml
@@ -9,7 +9,7 @@ spec:
   podSpec:
     containers:
       - name: https
-        image: kuberhealthy/http-check:v1.5.0
+        image: kuberhealthy/http-check:v1.5.1
         imagePullPolicy: IfNotPresent
         env:
           - name: CHECK_URL

diff --git a/cmd/http-content-check/Makefile b/cmd/http-content-check/Makefile
@@ -1,5 +1,5 @@
 BUILDER := http-content-check
 IMAGE := kuberhealthy/${BUILDER}
-TAG := v1.5.0
+TAG := v1.5.1
 
 include ../../Makefile
diff --git a/cmd/http-content-check/http-content-check.yaml b/cmd/http-content-check/http-content-check.yaml
@@ -7,7 +7,7 @@ spec:
   timeout: 2m # After this much time, Kuberhealthy will kill your check and consider it "failed"
   podSpec: # The exact pod spec that will run.  All normal pod spec is valid here.
     containers:
-      - image: kuberhealthy/http-content-check:v1.5.0 # The image of the check you just pushed
+      - image: kuberhealthy/http-content-check:v1.5.1 # The image of the check you just pushed
         imagePullPolicy: IfNotPresent # uses local image if present
         name: main
         env:

diff --git a/cmd/image-download-check/Makefile b/cmd/image-download-check/Makefile
@@ -1,5 +1,5 @@
 build:
-	docker build -t kuberhealthy/image-download-check:v0.0.1 -f Dockerfile ../../
+	docker build -t kuberhealthy/image-download-check:v0.1.0 -f Dockerfile ../../
 
 push:
-	docker push kuberhealthy/image-download-check:v0.0.1
+	docker push kuberhealthy/image-download-check:v0.1.0
diff --git a/cmd/image-download-check/image-download-check.yaml b/cmd/image-download-check/image-download-check.yaml
@@ -9,7 +9,7 @@ spec:
   podSpec:
     containers:
       - name: image-download-check
-        image: kuberhealthy/image-download-check:v0.0.1
+        image: kuberhealthy/image-download-check:v0.1.0
         imagePullPolicy: IfNotPresent
         env:
           - name: FULL_IMAGE_URL

diff --git a/cmd/kiam-check/Makefile b/cmd/kiam-check/Makefile
@@ -2,4 +2,4 @@ include ../../Makefile
 
 BUILDER := "dockerx-kiam-check"
 IMAGE := "kuberhealthy/kiam-check"
-TAG := "v1.3.0"
+TAG := "v1.3.1"
diff --git a/cmd/kiam-check/kiam-check.yaml b/cmd/kiam-check/kiam-check.yaml
@@ -11,7 +11,7 @@ spec:
   podSpec:
     containers:
       - name: kiam
-        image: kuberhealthy/kiam-check:v1.3.0
+        image: kuberhealthy/kiam-check:v1.3.1
         imagePullPolicy: IfNotPresent
         env:
           - name: AWS_REGION

diff --git a/cmd/kuberhealthy/.gitignore b/cmd/kuberhealthy/.gitignore
@@ -1 +1,2 @@
 kuberhealthy
+build.sh
diff --git a/cmd/kuberhealthy/Dockerfile b/cmd/kuberhealthy/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.2 as builder
+FROM golang:1.21.5 as builder
 LABEL LOCATION="git@github.com:kuberhealthy/kuberhealthy.git"
 LABEL DESCRIPTION="Kuberhealthy - Check and expose kubernetes cluster health in detail."
 COPY . /build

diff --git a/cmd/kuberhealthy/Makefile b/cmd/kuberhealthy/Makefile
@@ -6,15 +6,17 @@ TAG := "unstable"
 
 .PHONY: build build-dev push test run run-influx
 
-build:
-	docker buildx build --platform=linux/amd64 --no-cache --pull -t ${IMAGE}:${TAG} -f Dockerfile ../../
 build-dev:
-	docker buildx build --platform=linux/amd64 -t ${IMAGE}:${TAG} -f Dockerfile ../../
+	docker build -t ${IMAGE}:${TAG} -f Dockerfile ../../
+build:
+	docker buildx build --platform linux/amd64,linux/arm64 --push -t ${IMAGE}:${TAG} -f Dockerfile ../../
+push:
+	docker push ${IMAGE}:${TAG}
 test:
 	POD_NAME="kuberhealthy-test" go test -run TestWebServer -v -args -- --debug --forceMaster
 run:
 	go build
-	POD_NAME="kuberhealthy-test" ./kuberhealthy --debug --forceMaster
+	KH_EXTERNAL_REPORTING_URL=localhost:8006 POD_NAMESPACE=kuberhealthy POD_NAME="kuberhealthy-test" ./kuberhealthy --debug --forceMaster --config ./test/test-config.yaml
 run-influx:
 	go build
 	POD_NAME="kuberhealthy-test" ./kuberhealthy -debug -forceMaster -enableInflux -influxUrl=http://localhost:8086 -influxDB=kuberhealthy