Skip to content

Commit 0878548

Browse files
otrosienotrosien
committed
Merge branch 'drop-es7' into github-container-registry
2 parents 75883b8 + 0b701d7 commit 0878548

File tree

12 files changed

+39
-39
lines changed

12 files changed

+39
-39
lines changed

‎.github/workflows/run_e2e.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ while [ "$(kubectl -n "$namespace" get pod -l application=es-operator -o jsonpat
3232
sleep 5
3333
done
3434
# wait for es master pods to be ready
35-
for pod in es8-master-0 es7-master-0; do
35+
for pod in es8-master-0 es9-master-0; do
3636
while [ "$(kubectl -n "$namespace" get pod "$pod" -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}')" != "True" ]; do
3737
echo "Waiting for ready '${pod}' pod"
3838
sleep 5
@@ -43,7 +43,7 @@ done
4343
OPERATOR_ID=es-operator-e2e \
4444
E2E_NAMESPACE=es-operator-e2e \
4545
ES_SERVICE_ENDPOINT_ES8="http://127.0.0.1:8001/api/v1/namespaces/es-operator-e2e/services/es8-master:9200/proxy" \
46-
ES_SERVICE_ENDPOINT_ES7="http://127.0.0.1:8001/api/v1/namespaces/es-operator-e2e/services/es7-master:9200/proxy" \
46+
ES_SERVICE_ENDPOINT_ES9="http://127.0.0.1:8001/api/v1/namespaces/es-operator-e2e/services/es9-master:9200/proxy" \
4747
KUBECONFIG="${HOME}/.kube/config" ./build/linux/e2e -test.v
4848

4949
kill "$proxy_pid"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Starting with `v0.1.3` the ES-Operator is dual-licensed under [MIT](/LICENSE.MIT
1616

1717
## Compatibility
1818

19-
The ES-Operator has been tested with Elasticsearch 7.x and 8.x. Previously, we have also tested ES-Operator with Elasticsearch 6.x, and while it still may be working, please consider this support to be dropped.
19+
The ES-Operator has been tested with Elasticsearch 8.x and 9.x. Previously, we have also tested ES-Operator with Elasticsearch 6.x and 7.x, and while they still may be working, please consider support for these versions to be dropped.
2020

2121
## How it works
2222

‎cmd/e2e/autoscale_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func TestEDSCPUAutoscaleUP8(t *testing.T) {
1313
t.Parallel()
14-
runTestEDSCPUAutoScaleUP(t, "8.6.2", "es8-config")
14+
runTestEDSCPUAutoScaleUP(t, "8.19.5", "es8-config")
1515
}
1616

1717
func runTestEDSCPUAutoScaleUP(t *testing.T, version, configMap string) {
@@ -56,12 +56,12 @@ func runTestEDSCPUAutoScaleUP(t *testing.T, version, configMap string) {
5656

5757
func TestEDSAutoscaleUPOnShardCount6(t *testing.T) {
5858
t.Parallel()
59-
runTestEDSAutoscaleUPOnShardCount(t, "8.6.2", "es8-config")
59+
runTestEDSAutoscaleUPOnShardCount(t, "8.19.5", "es8-config")
6060
}
6161

62-
func TestEDSAutoscaleUPOnShardCount7(t *testing.T) {
62+
func TestEDSAutoscaleUPOnShardCount9(t *testing.T) {
6363
t.Parallel()
64-
runTestEDSAutoscaleUPOnShardCount(t, "7.17.2", "es7-config")
64+
runTestEDSAutoscaleUPOnShardCount(t, "9.1.5", "es9-config")
6565
}
6666

6767
func runTestEDSAutoscaleUPOnShardCount(t *testing.T, version, configMap string) {

‎cmd/e2e/basic_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,16 @@ func mergeLabels(labelsSlice ...map[string]string) map[string]string {
119119
func TestEDSCreateBasic8(t *testing.T) {
120120
t.Parallel()
121121
edsName := "basic8"
122-
edsSpec := testEDSCreate(t, edsName, "8.6.2", "es8-config")
122+
edsSpec := testEDSCreate(t, edsName, "8.19.5", "es8-config")
123123
verifyEDS(t, edsName, edsSpec, edsSpec.Replicas)
124124
err := deleteEDS(edsName)
125125
require.NoError(t, err)
126126
}
127127

128-
func TestEDSCreateBasic7(t *testing.T) {
128+
func TestEDSCreateBasic9(t *testing.T) {
129129
t.Parallel()
130-
edsName := "basic7"
131-
edsSpec := testEDSCreate(t, edsName, "7.17.2", "es7-config")
130+
edsName := "basic9"
131+
edsSpec := testEDSCreate(t, edsName, "9.1.5", "es9-config")
132132
verifyEDS(t, edsName, edsSpec, edsSpec.Replicas)
133133
err := deleteEDS(edsName)
134134
require.NoError(t, err)

‎cmd/e2e/test_environment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ func setupESClient(defaultServiceEndpoint, version string) (*operator.ESClient,
7777
var envSuffix string
7878
if len(version) > 0 {
7979
switch version[0] {
80-
case '7':
81-
envSuffix = "_ES7"
8280
case '8':
8381
envSuffix = "_ES8"
82+
case '9':
83+
envSuffix = "_ES9"
8484
}
8585
}
8686
serviceEndpoint := os.Getenv("ES_SERVICE_ENDPOINT" + envSuffix)

‎cmd/e2e/upgrade_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
func TestEDSUpgradingEDS(t *testing.T) {
1010
t.Parallel()
1111
edsName := "upgrade"
12-
edsSpec := testEDSCreate(t, edsName, "8.6.2", "es8-config")
12+
edsSpec := testEDSCreate(t, edsName, "8.19.5", "es8-config")
1313
eds := verifyEDS(t, edsName, edsSpec, edsSpec.Replicas)
1414
// this could become a test for a major version upgrade in the future.
1515
eds.Spec.Template.Spec.Containers[0].Image = "docker.elastic.co/elasticsearch/elasticsearch:8.6.0"

‎deploy/e2e/apply/es8-master.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ spec:
2424
- name: elasticsearch
2525
resources:
2626
requests:
27-
memory: 1Gi
27+
memory: 1120Mi
2828
cpu: 100m
2929
limits:
30-
memory: 1Gi
30+
memory: 1120Mi
3131
cpu: 100m
32-
image: "docker.elastic.co/elasticsearch/elasticsearch:8.6.2"
32+
image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.5"
3333
env:
3434
- name: "node.name"
3535
valueFrom:
3636
fieldRef:
3737
fieldPath: metadata.name
3838
- name: "ES_JAVA_OPTS"
39-
value: "-Xms360m -Xmx360m"
39+
value: "-Xms560m -Xmx560m"
4040
- name: node.roles
4141
value: "master,data"
4242
readinessProbe:

deploy/e2e/apply/es7-config.yaml renamed to deploy/e2e/apply/es9-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: es7-config
4+
name: es9-config
55
data:
66
elasticsearch.yml: |
7-
cluster.name: es7-operator-e2e
7+
cluster.name: es9-operator-e2e
88
network.host: "0.0.0.0"
99
bootstrap.memory_lock: false
10-
discovery.seed_hosts: [es7-master]
11-
cluster.initial_master_nodes: [es7-master-0]
10+
discovery.seed_hosts: [es9-master]
11+
cluster.initial_master_nodes: [es9-master-0]
1212
xpack.security.enabled: false
1313
xpack.security.transport.ssl.enabled: false
1414
xpack.security.http.ssl.enabled: false

deploy/e2e/apply/es7-master-service.yaml renamed to deploy/e2e/apply/es9-master-service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: es7-master
4+
name: es9-master
55
spec:
66
clusterIP: None
77
publishNotReadyAddresses: true
88
selector:
9-
application: es7
9+
application: es9
1010
role: master
1111
ports:
1212
- name: transport

deploy/e2e/apply/es7-master.yaml renamed to deploy/e2e/apply/es9-master.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
4-
name: es7-master
4+
name: es9-master
55
spec:
66
replicas: 1
7-
serviceName: es7-master
7+
serviceName: es9-master
88
selector:
99
matchLabels:
10-
application: es7
10+
application: es9
1111
role: master
1212
template:
1313
metadata:
1414
labels:
15-
application: es7
15+
application: es9
1616
role: master
1717
spec:
1818
securityContext:
@@ -22,19 +22,19 @@ spec:
2222
- name: elasticsearch
2323
resources:
2424
requests:
25-
memory: 720Mi
25+
memory: 1120Mi
2626
cpu: 100m
2727
limits:
28-
memory: 720Mi
28+
memory: 1120Mi
2929
cpu: 100m
30-
image: "docker.elastic.co/elasticsearch/elasticsearch:7.17.2"
30+
image: "docker.elastic.co/elasticsearch/elasticsearch:9.1.5"
3131
env:
3232
- name: "node.name"
3333
valueFrom:
3434
fieldRef:
3535
fieldPath: metadata.name
3636
- name: "ES_JAVA_OPTS"
37-
value: "-Xmx360m -Xms360m"
37+
value: "-Xmx560m -Xms560m"
3838
- name: node.roles
3939
value: "master,data"
4040
readinessProbe:
@@ -59,7 +59,7 @@ spec:
5959
emptyDir: {}
6060
- name: config
6161
configMap:
62-
name: es7-config
62+
name: es9-config
6363
items:
6464
- key: elasticsearch.yml
6565
path: elasticsearch.yml

0 commit comments

Comments
 (0)