Skip to content

Commit d040934

Browse files
committed
CSPL-3558 Update of k8s version
1 parent c204d52 commit d040934

File tree

4 files changed

+40
-4
lines changed

4 files changed

+40
-4
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ GO_VERSION=1.23.0
44
AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
55
KUBECTL_VERSION=v1.29.1
66
AZ_CLI_VERSION=2.30.0
7-
EKSCTL_VERSION=v0.191.0
8-
EKS_CLUSTER_K8_VERSION=1.31
7+
EKSCTL_VERSION=v0.214.0
8+
EKS_CLUSTER_K8_VERSION=1.33
99
EKS_INSTANCE_TYPE=m5.2xlarge
1010
EKS_INSTANCE_TYPE_ARM64=c6g.4xlarge
1111
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.4.3

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ BUNDLE_IMG ?= ${IMAGE_TAG_BASE}-bundle:v${VERSION}
5959
# Image URL to use all building/pushing image targets
6060
IMG ?= controller:latest
6161
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
62-
ENVTEST_K8S_VERSION = 1.31.0
62+
ENVTEST_K8S_VERSION = 1.33.0
6363

6464
ignore-not-found ?= True
6565

test/env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
: "${EKS_INSTANCE_TYPE:=m5.2xlarge}"
1414
: "${VPC_PUBLIC_SUBNET_STRING:=}"
1515
: "${VPC_PRIVATE_SUBNET_STRING:=}"
16-
: "${EKS_CLUSTER_K8_VERSION:=1.31}"
16+
: "${EKS_CLUSTER_K8_VERSION:=1.33}"
1717
# Below env variables required to run license master test cases
1818
: "${ENTERPRISE_LICENSE_S3_PATH:=test_licenses/}"
1919
: "${TEST_S3_BUCKET:=splk-test-data-bucket}"

test/index_and_ingestion_separation/index_and_ingestion_separation_test.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,42 @@ var _ = Describe("indingsep test", func() {
118118
})
119119
})
120120

121+
// Context("Ingestor and Indexer deployment", func() {
122+
// It("indingsep, smoke, indingsep: Splunk Operator can deploy Ingestors and Indexers with additional configurations", func() {
123+
// // Create Service Account
124+
// testcaseEnvInst.Log.Info("Create Service Account")
125+
// testcaseEnvInst.CreateServiceAccount(serviceAccountName)
126+
127+
// // Deploy Ingestor Cluster
128+
// testcaseEnvInst.Log.Info("Deploy Ingestor Cluster")
129+
// _, err := deployment.DeployIngestorCluster(ctx, deployment.GetName()+"-ingest", 3, bus, pipelineConfig, serviceAccountName)
130+
// Expect(err).To(Succeed(), "Unable to deploy Ingestor Cluster")
131+
132+
// // Deploy Cluster Manager
133+
// testcaseEnvInst.Log.Info("Deploy Cluster Manager")
134+
// _, err = deployment.DeployClusterManagerWithGivenSpec(ctx, deployment.GetName(), cmSpec)
135+
// Expect(err).To(Succeed(), "Unable to deploy Cluster Manager")
136+
137+
// // Deploy Indexer Cluster
138+
// testcaseEnvInst.Log.Info("Deploy Indexer Cluster")
139+
// _, err = deployment.DeployIndexerCluster(ctx, deployment.GetName()+"-idxc", "", 3, deployment.GetName(), "", bus, pipelineConfig, serviceAccountName)
140+
// Expect(err).To(Succeed(), "Unable to deploy Indexer Cluster")
141+
142+
// // Ensure that Ingestor Cluster is in Ready phase
143+
// testcaseEnvInst.Log.Info("Ensure that Ingestor Cluster is in Ready phase")
144+
// testenv.IngestorReady(ctx, deployment, testcaseEnvInst)
145+
146+
// // Ensure that Cluster Manager is in Ready phase
147+
// testcaseEnvInst.Log.Info("Ensure that Cluster Manager is in Ready phase")
148+
// testenv.ClusterManagerReady(ctx, deployment, testcaseEnvInst)
149+
150+
// // Ensure that Indexer Cluster is in Ready phase
151+
// testcaseEnvInst.Log.Info("Ensure that Indexer Cluster is in Ready phase")
152+
// testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
153+
154+
// })
155+
// })
156+
121157
Context("Ingestor and Indexer deployment", func() {
122158
It("indingsep, integration, indingsep: Splunk Operator can deploy Ingestors and Indexers with correct setup", func() {
123159
// Create Service Account

0 commit comments

Comments
 (0)