test: upgrade to latest kind and cleanup chart e2e test

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

.github/workflows/e2e.yaml

@@ -9,8 +9,8 @@ on:
 
 env:
   GO_VERSION: '1.20'
-  KIND_VERSION: 'v0.17.0'
-  KIND_NODE_VERSION: 'v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61'
+  KIND_VERSION: 'v0.19.0'
+  KIND_NODE_VERSION: 'kindest/node:v1.23.17@sha256:f77f8cf0b30430ca4128cc7cfafece0c274a118cd0cdb251049664ace0dee4ff'
   KUBECTL_VERSION: 'v1.24.1'
 
 jobs:
@@ -73,9 +73,6 @@ jobs:
       - name: Build controller image
         run: make docker-build IMG='controller:local'
 
-      - name: Build e2e fluentd image
-        run: make docker-build-e2e-fluentd IMG='fluentd:local'
-
       - name: Create logging namespace
         run: kubectl create namespace logging
 

Makefile

@@ -11,7 +11,7 @@ DOCKER ?= docker
 GOVERSION = $(shell go env GOVERSION)
 
 # Image name to use for building/pushing image targets
-IMG ?= controller:latest
+IMG ?= controller:local
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false,maxDescLen=0"
@@ -74,10 +74,6 @@ docker-build: ## Build the docker image
 	@echo "updating kustomize image patch file for manager resource"
 	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_image_patch.yaml
 
-.PHONY: docker-build-e2e-fluentd
-docker-build-e2e-fluentd: ## Build fluentd docker image
-	${DOCKER} build ./fluentd-image/e2e-test -t ${IMG}
-
 .PHONY: docker-build-drain-watch
 docker-build-drain-watch: ## Build the drain-watch docker image
 	${DOCKER} build drain-watch-image -t ${DRAIN_WATCH_IMAGE_TAG_NAME}:${DRAIN_WATCH_IMAGE_TAG_VERSION}

config/default/manager_image_patch.yaml

@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: controller:latest
+      - image: controller:local
         name: manager

config/default/manager_image_patch.yaml-e

@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: controller:latest
+      - image: controller:local
         name: manager

config/manager/manager.yaml

@@ -27,7 +27,7 @@ spec:
         - /manager
         args:
         - --enable-leader-election
-        image: controller:latest
+        image: controller:local
         name: manager
         resources:
           limits:

e2e/common/cluster.go

@@ -33,8 +33,6 @@ import (
 	"github.com/kube-logging/logging-operator/e2e/common/kind"
 )
 
-const defaultClusterName = "e2e-test"
-
 type Cluster interface {
 	cluster.Cluster
 	LoadImages(images ...string) error