From 2b0ae6f3efa57e09dbdc403a9386c78a1fef2d57 Mon Sep 17 00:00:00 2001 From: Arjun Kondur Date: Fri, 25 Oct 2024 15:29:48 -0500 Subject: [PATCH 1/3] Update K8s version, eksctl version --- .env | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 7c166b57a..5db3472fa 100644 --- a/.env +++ b/.env @@ -4,6 +4,6 @@ GO_VERSION=1.23.0 AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip KUBECTL_VERSION=v1.29.1 AZ_CLI_VERSION=2.30.0 -EKSCTL_VERSION=v0.143.0 -EKS_CLUSTER_K8_VERSION=1.27 +EKSCTL_VERSION=v0.191.0 +EKS_CLUSTER_K8_VERSION=1.31 SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.3.0 diff --git a/Makefile b/Makefile index 94853d581..64a0de8e7 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ docker-push: ## Push docker image with the manager. # To properly provided solutions that supports more than one platform you should use this option. PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le .PHONY: docker-buildx -docker-buildx: test ## Build and push docker image for the manager for cross-platform support +docker-buildx: #test ## Build and push docker image for the manager for cross-platform support # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder From e6979eca3bd0685aacffa448a1dd244b71190cc1 Mon Sep 17 00:00:00 2001 From: Arjun Kondur Date: Fri, 25 Oct 2024 15:32:53 -0500 Subject: [PATCH 2/3] Change def storage class --- test/deploy-eks-cluster.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/deploy-eks-cluster.sh b/test/deploy-eks-cluster.sh index c5c405a22..faa83a597 100755 --- a/test/deploy-eks-cluster.sh +++ b/test/deploy-eks-cluster.sh @@ -93,6 +93,8 @@ function createCluster() { kubectl annotate serviceaccount -n $namespace $service_account eks.amazonaws.com/role-arn=arn:aws:iam::$account_id:role/${rolename} eksctl create addon --name aws-ebs-csi-driver --cluster ${TEST_CLUSTER_NAME} --service-account-role-arn arn:aws:iam::$account_id:role/${rolename} --force eksctl utils update-cluster-logging --cluster ${TEST_CLUSTER_NAME} + # CSPL-2887 - Patch the default storage class to gp2 + kubectl patch storageclass gp2 -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}' else echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}" # Cluster exists but kubeconfig may not From e86436e445fdc00865f9eb4c8757278d49401c7f Mon Sep 17 00:00:00 2001 From: Arjun Kondur Date: Fri, 25 Oct 2024 15:33:36 -0500 Subject: [PATCH 3/3] Remove Makefile change --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 64a0de8e7..94853d581 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ docker-push: ## Push docker image with the manager. # To properly provided solutions that supports more than one platform you should use this option. PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le .PHONY: docker-buildx -docker-buildx: #test ## Build and push docker image for the manager for cross-platform support +docker-buildx: test ## Build and push docker image for the manager for cross-platform support # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder