Merge branch 'main' into add_recombine_with_option_in_multiline

signalfx · Oct 31, 2023 · c3c3fee · c3c3fee
2 parents b3aaa6c + 6448844
commit c3c3fee
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.chloggen/featureremovedefaultallowedFlexVolumes.yaml b/.chloggen/featureremovedefaultallowedFlexVolumes.yaml
@@ -0,0 +1,5 @@
+change_type: 'bug_fix'
+component: 'chart'
+note: "Remove by default empty allowedFlexVolumes"
+issues: [981]
+subtext: "Removed the allowedFlexVolumes empty field since it does not provide any default additional benefits for the users."
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -20,7 +20,7 @@ jobs:
           version: v3.11.3
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.0
         with:
           version: v3.7.1
 

diff --git a/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml b/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml
@@ -23,7 +23,6 @@ allowHostPID: true
 allowHostPorts: true
 allowPrivilegedContainer: false
 allowedCapabilities: []
-allowedFlexVolumes: []
 defaultAddCapabilities: []
 fsGroup:
   type: MustRunAs

diff --git a/functional_tests/go.mod b/functional_tests/go.mod
@@ -6,7 +6,7 @@ module github.com/signalfx/splunk-otel-collector-chart/functional_tests
 go 1.20
 
 require (
-	github.com/docker/docker v23.0.3+incompatible
+	github.com/docker/docker v24.0.7+incompatible
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.86.0

diff --git a/functional_tests/go.sum b/functional_tests/go.sum
@@ -664,8 +664,8 @@ github.com/docker/cli v23.0.3+incompatible h1:Zcse1DuDqBdgI7OQDV8Go7b83xLgfhW1ez
 github.com/docker/cli v23.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v23.0.3+incompatible h1:9GhVsShNWz1hO//9BNg/dpMnZW25KydO4wtVxWAIbho=
-github.com/docker/docker v23.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=

diff --git a/helm-charts/splunk-otel-collector/templates/securityContextConstraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextConstraints.yaml
@@ -23,7 +23,6 @@ seLinuxContext:
     role: "system_r"
     type: "spc_t"
     level: "s0"
-allowedFlexVolumes: []
 allowedCapabilities: []
 defaultAddCapabilities: []
 fsGroup: