Skip to content

Upgrade to es/kb 8.16.1 - es user id to 10001 #3647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rene-dekker merged 1 commit into from
Dec 13, 2024
Merged

Upgrade to es/kb 8.16.1 - es user id to 10001 #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/enterprise_versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ components:
image: tigera/dex
version: master
eck-kibana:
version: 8.15.3
version: 8.16.1
kibana:
image: tigera/kibana
version: master
eck-elasticsearch:
version: 8.15.3
version: 8.16.1
elasticsearch:
image: tigera/elasticsearch
version: master
Expand Down
4 changes: 2 additions & 2 deletions pkg/components/enterprise.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ var (
}

ComponentEckElasticsearch = Component{
Version: "8.15.3",
Version: "8.16.1",
Registry: "",
}

ComponentEckKibana = Component{
Version: "8.15.3",
Version: "8.16.1",
Registry: "",
}

Expand Down
4 changes: 0 additions & 4 deletions pkg/render/logstorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
"github.com/tigera/operator/pkg/common"
"github.com/tigera/operator/pkg/components"
"github.com/tigera/operator/pkg/dns"
"github.com/tigera/operator/pkg/ptr"
relasticsearch "github.com/tigera/operator/pkg/render/common/elasticsearch"
rmeta "github.com/tigera/operator/pkg/render/common/meta"
"github.com/tigera/operator/pkg/render/common/networkpolicy"
Expand Down Expand Up @@ -370,9 +369,6 @@ func (es *elasticsearchComponent) podTemplate() corev1.PodTemplateSpec {
}

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

esContainer := corev1.Container{
Name: "elasticsearch",
Expand Down
4 changes: 2 additions & 2 deletions pkg/render/logstorage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ var _ = Describe("Elasticsearch rendering tests", func() {
esContainer := resultES.Spec.NodeSets[0].PodTemplate.Spec.Containers[0]
Expect(*esContainer.SecurityContext.AllowPrivilegeEscalation).To(BeFalse())
Expect(*esContainer.SecurityContext.Privileged).To(BeFalse())
Expect(*esContainer.SecurityContext.RunAsGroup).To(BeEquivalentTo(1000))
Expect(*esContainer.SecurityContext.RunAsGroup).To(BeEquivalentTo(10001))
Expect(*esContainer.SecurityContext.RunAsNonRoot).To(BeTrue())
Expect(*esContainer.SecurityContext.RunAsUser).To(BeEquivalentTo(1000))
Expect(*esContainer.SecurityContext.RunAsUser).To(BeEquivalentTo(10001))
Expect(esContainer.SecurityContext.Capabilities).To(Equal(
&corev1.Capabilities{
Drop: []corev1.Capability{"ALL"},
Expand Down