Skip to content

Commit

Permalink
Upgrade helm to v3.14.2 (#2356)
Browse files Browse the repository at this point in the history
* Bump helm

* Disable PSP feature leave rules

* Bumping elastic-agent-autodiscover

* Lint fixes

* Linter empty space

* Commenting out CI tests and removing codeblocks from core code

* Comment out EKS PSP

* Remove imports from CI tests

* Update rules coverage

(cherry picked from commit 0029a1a)

# Conflicts:
#	go.mod
#	go.sum
  • Loading branch information
jeniawhite authored and mergify[bot] committed Jul 28, 2024
1 parent b4d79a3 commit 81846f9
Show file tree
Hide file tree
Showing 19 changed files with 244 additions and 239 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ jobs:
- test-target: k8s_file_system_rules
kind-config: kind-test-files
values-file: tests/test_environments/values/ci-test-k8s-files.yml
- test-target: k8s_object_psp_rules
kind-config: kind-multi
values-file: tests/test_environments/values/ci-test-k8s-objects.yml
# - test-target: k8s_object_psp_rules
# kind-config: kind-multi
# values-file: tests/test_environments/values/ci-test-k8s-objects.yml
- test-target: k8s_process_rules
kind-config: kind-test-proc-conf1
values-file: tests/test_environments/values/ci-test-k8s-proc-conf1.yml
Expand Down
8 changes: 4 additions & 4 deletions deploy/k8s/fleet-managed-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@ rules:
- ingresses
- networkpolicies
verbs: ["get", "list", "watch"]
- apiGroups: ["policy"]
resources:
- podsecuritypolicies
verbs: ["get", "list", "watch"]
# - apiGroups: ["policy"]
# resources:
# - podsecuritypolicies
# verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
8 changes: 4 additions & 4 deletions deploy/k8s/standalone-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,10 @@ rules:
- ingresses
- networkpolicies
verbs: ["get", "list", "watch"]
- apiGroups: ["policy"]
resources:
- podsecuritypolicies
verbs: ["get", "list", "watch"]
# - apiGroups: ["policy"]
# resources:
# - podsecuritypolicies
# verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
8 changes: 4 additions & 4 deletions deploy/kustomize/base/role.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ rules:
- ingresses
- networkpolicies
verbs: ["get", "list", "watch"]
- apiGroups: ["policy"]
resources:
- podsecuritypolicies
verbs: ["get", "list", "watch"]
# - apiGroups: ["policy"]
# resources:
# - podsecuritypolicies
# verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ rules:
- roles
verbs: ["get", "list", "watch"]
# Needed for cloudbeat
- apiGroups: ["policy"]
resources:
- podsecuritypolicies
verbs: ["get", "list", "watch"]
# - apiGroups: ["policy"]
# resources:
# - podsecuritypolicies
# verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down
33 changes: 30 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,17 @@ require (
github.com/djherbis/times v1.6.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240524163615-2d687ac9d228
github.com/elastic/e2e-testing v1.99.2-0.20231005090720-556e60d449dc
<<<<<<< HEAD
github.com/elastic/elastic-agent-autodiscover v0.6.14
github.com/elastic/elastic-agent-client/v7 v7.9.0
github.com/elastic/elastic-agent-libs v0.9.8
github.com/elastic/go-licenser v0.4.1
=======
github.com/elastic/elastic-agent-autodiscover v0.8.0
github.com/elastic/elastic-agent-client/v7 v7.15.0
github.com/elastic/elastic-agent-libs v0.9.15
github.com/elastic/go-licenser v0.4.2
>>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356))
github.com/elastic/go-ucfg v0.8.8
github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a
github.com/gofrs/uuid v4.4.0+incompatible
Expand All @@ -78,10 +85,17 @@ require (
golang.org/x/oauth2 v0.21.0
google.golang.org/api v0.186.0
gopkg.in/yaml.v2 v2.4.0
<<<<<<< HEAD
gotest.tools/gotestsum v1.11.0
k8s.io/api v0.28.10
k8s.io/apimachinery v0.28.10
k8s.io/client-go v0.28.10
=======
gotest.tools/gotestsum v1.12.0
k8s.io/api v0.29.5
k8s.io/apimachinery v0.29.5
k8s.io/client-go v0.29.5
>>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356))
k8s.io/klog/v2 v2.120.1
modernc.org/sqlite v1.29.2
)
Expand All @@ -107,7 +121,9 @@ require (
github.com/google/gnostic-models v0.6.8 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
Expand Down Expand Up @@ -230,7 +246,7 @@ require (
github.com/dnephin/pflag v1.0.7 // indirect
github.com/docker/cli v25.0.5+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v25.0.5+incompatible // indirect
github.com/docker/docker v26.1.4+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
Expand All @@ -254,7 +270,7 @@ require (
github.com/elliotchance/orderedmap v1.5.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
Expand Down Expand Up @@ -495,8 +511,9 @@ require (
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.13.0 // indirect
helm.sh/helm/v3 v3.14.2 // indirect
howett.net/plist v1.0.1 // indirect
<<<<<<< HEAD
k8s.io/apiextensions-apiserver v0.28.2 // indirect
k8s.io/apiserver v0.28.2 // indirect
k8s.io/cli-runtime v0.28.4 // indirect
Expand All @@ -505,6 +522,16 @@ require (
k8s.io/kubectl v0.28.3 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
modernc.org/libc v1.41.0 // indirect
=======
k8s.io/apiextensions-apiserver v0.29.0 // indirect
k8s.io/apiserver v0.29.0 // indirect
k8s.io/cli-runtime v0.29.0 // indirect
k8s.io/component-base v0.29.0 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubectl v0.29.0 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
modernc.org/libc v1.52.1 // indirect
>>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356))
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect
modernc.org/strutil v1.2.0 // indirect
Expand Down
Loading

0 comments on commit 81846f9

Please sign in to comment.