diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index aa95ff6c74..060db2a9c8 100644 --- a/config/enterprise_versions.yml +++ b/config/enterprise_versions.yml @@ -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 diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index ec01fec101..05dc41b1b9 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -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: "", } diff --git a/pkg/render/logstorage.go b/pkg/render/logstorage.go index 34e88e3af4..3f93c063df 100644 --- a/pkg/render/logstorage.go +++ b/pkg/render/logstorage.go @@ -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" @@ -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", diff --git a/pkg/render/logstorage_test.go b/pkg/render/logstorage_test.go index 33d1351040..0cbbb0ca8f 100644 --- a/pkg/render/logstorage_test.go +++ b/pkg/render/logstorage_test.go @@ -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"},