Skip to content

Commit 4cb796d

Browse files
authored
Upgrade to es/kb 8.16.1 - es user id to 10001 (#3647)
1 parent 65f3256 commit 4cb796d

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

config/enterprise_versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ components:
4646
image: tigera/dex
4747
version: master
4848
eck-kibana:
49-
version: 8.15.3
49+
version: 8.16.1
5050
kibana:
5151
image: tigera/kibana
5252
version: master
5353
eck-elasticsearch:
54-
version: 8.15.3
54+
version: 8.16.1
5555
elasticsearch:
5656
image: tigera/elasticsearch
5757
version: master

pkg/components/enterprise.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ var (
6969
}
7070

7171
ComponentEckElasticsearch = Component{
72-
Version: "8.15.3",
72+
Version: "8.16.1",
7373
Registry: "",
7474
}
7575

7676
ComponentEckKibana = Component{
77-
Version: "8.15.3",
77+
Version: "8.16.1",
7878
Registry: "",
7979
}
8080

pkg/render/logstorage.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import (
4040
"github.com/tigera/operator/pkg/common"
4141
"github.com/tigera/operator/pkg/components"
4242
"github.com/tigera/operator/pkg/dns"
43-
"github.com/tigera/operator/pkg/ptr"
4443
relasticsearch "github.com/tigera/operator/pkg/render/common/elasticsearch"
4544
rmeta "github.com/tigera/operator/pkg/render/common/meta"
4645
"github.com/tigera/operator/pkg/render/common/networkpolicy"
@@ -370,9 +369,6 @@ func (es *elasticsearchComponent) podTemplate() corev1.PodTemplateSpec {
370369
}
371370

372371
sc := securitycontext.NewNonRootContext()
373-
// Set the user and group to be the default elasticsearch ID
374-
sc.RunAsUser = ptr.Int64ToPtr(1000)
375-
sc.RunAsGroup = ptr.Int64ToPtr(1000)
376372

377373
esContainer := corev1.Container{
378374
Name: "elasticsearch",

pkg/render/logstorage_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ var _ = Describe("Elasticsearch rendering tests", func() {
221221
esContainer := resultES.Spec.NodeSets[0].PodTemplate.Spec.Containers[0]
222222
Expect(*esContainer.SecurityContext.AllowPrivilegeEscalation).To(BeFalse())
223223
Expect(*esContainer.SecurityContext.Privileged).To(BeFalse())
224-
Expect(*esContainer.SecurityContext.RunAsGroup).To(BeEquivalentTo(1000))
224+
Expect(*esContainer.SecurityContext.RunAsGroup).To(BeEquivalentTo(10001))
225225
Expect(*esContainer.SecurityContext.RunAsNonRoot).To(BeTrue())
226-
Expect(*esContainer.SecurityContext.RunAsUser).To(BeEquivalentTo(1000))
226+
Expect(*esContainer.SecurityContext.RunAsUser).To(BeEquivalentTo(10001))
227227
Expect(esContainer.SecurityContext.Capabilities).To(Equal(
228228
&corev1.Capabilities{
229229
Drop: []corev1.Capability{"ALL"},

0 commit comments

Comments
 (0)