Skip to content

Commit e74546d

Browse files
committed
security update (update modules, fix seccomp profile)
1 parent 29fe5b7 commit e74546d

File tree

9 files changed

+11
-276
lines changed

9 files changed

+11
-276
lines changed

config/default/kustomization.yaml

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,8 @@
1-
# Adds namespace to all resources.
21
namespace: irsa-manager-system
32

4-
# Value of this field is prepended to the
5-
# names of all resources, e.g. a deployment named
6-
# "wordpress" becomes "alices-wordpress".
7-
# Note that it should also match with the prefix (text before '-') of the namespace
8-
# field above.
93
namePrefix: irsa-manager-
104

11-
# Labels to add to all resources and selectors.
12-
#labels:
13-
#- includeSelectors: true
14-
# pairs:
15-
# someName: someValue
16-
175
resources:
186
- ../crd
197
- ../rbac
208
- ../manager
21-
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
22-
# crd/kustomization.yaml
23-
#- ../webhook
24-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
25-
#- ../certmanager
26-
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
27-
#- ../prometheus
28-
29-
# patches:
30-
# Protect the /metrics endpoint by putting it behind auth.
31-
# If you want your controller-manager to expose the /metrics
32-
# endpoint w/o any authn/z, please comment the following line.
33-
# - path: manager_auth_proxy_patch.yaml
34-
35-
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
36-
# crd/kustomization.yaml
37-
#- path: manager_webhook_patch.yaml
38-
39-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
40-
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
41-
# 'CERTMANAGER' needs to be enabled to use ca injection
42-
#- path: webhookcainjection_patch.yaml
43-
44-
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
45-
# Uncomment the following replacements to add the cert-manager CA injection annotations
46-
#replacements:
47-
# - source: # Add cert-manager annotation to ValidatingWebhookConfiguration, MutatingWebhookConfiguration and CRDs
48-
# kind: Certificate
49-
# group: cert-manager.io
50-
# version: v1
51-
# name: serving-cert # this name should match the one in certificate.yaml
52-
# fieldPath: .metadata.namespace # namespace of the certificate CR
53-
# targets:
54-
# - select:
55-
# kind: ValidatingWebhookConfiguration
56-
# fieldPaths:
57-
# - .metadata.annotations.[cert-manager.io/inject-ca-from]
58-
# options:
59-
# delimiter: '/'
60-
# index: 0
61-
# create: true
62-
# - select:
63-
# kind: MutatingWebhookConfiguration
64-
# fieldPaths:
65-
# - .metadata.annotations.[cert-manager.io/inject-ca-from]
66-
# options:
67-
# delimiter: '/'
68-
# index: 0
69-
# create: true
70-
# - select:
71-
# kind: CustomResourceDefinition
72-
# fieldPaths:
73-
# - .metadata.annotations.[cert-manager.io/inject-ca-from]
74-
# options:
75-
# delimiter: '/'
76-
# index: 0
77-
# create: true
78-
# - source:
79-
# kind: Certificate
80-
# group: cert-manager.io
81-
# version: v1
82-
# name: serving-cert # this name should match the one in certificate.yaml
83-
# fieldPath: .metadata.name
84-
# targets:
85-
# - select:
86-
# kind: ValidatingWebhookConfiguration
87-
# fieldPaths:
88-
# - .metadata.annotations.[cert-manager.io/inject-ca-from]
89-
# options:
90-
# delimiter: '/'
91-
# index: 1
92-
# create: true
93-
# - select:
94-
# kind: MutatingWebhookConfiguration
95-
# fieldPaths:
96-
# - .metadata.annotations.[cert-manager.io/inject-ca-from]
97-
# options:
98-
# delimiter: '/'
99-
# index: 1
100-
# create: true
101-
# - select:
102-
# kind: CustomResourceDefinition
103-
# fieldPaths:
104-
# - .metadata.annotations.[cert-manager.io/inject-ca-from]
105-
# options:
106-
# delimiter: '/'
107-
# index: 1
108-
# create: true
109-
# - source: # Add cert-manager annotation to the webhook Service
110-
# kind: Service
111-
# version: v1
112-
# name: webhook-service
113-
# fieldPath: .metadata.name # namespace of the service
114-
# targets:
115-
# - select:
116-
# kind: Certificate
117-
# group: cert-manager.io
118-
# version: v1
119-
# fieldPaths:
120-
# - .spec.dnsNames.0
121-
# - .spec.dnsNames.1
122-
# options:
123-
# delimiter: '.'
124-
# index: 0
125-
# create: true
126-
# - source:
127-
# kind: Service
128-
# version: v1
129-
# name: webhook-service
130-
# fieldPath: .metadata.namespace # namespace of the service
131-
# targets:
132-
# - select:
133-
# kind: Certificate
134-
# group: cert-manager.io
135-
# version: v1
136-
# fieldPaths:
137-
# - .spec.dnsNames.0
138-
# - .spec.dnsNames.1
139-
# options:
140-
# delimiter: '.'
141-
# index: 1
142-
# create: true

config/default/manager_auth_proxy_patch.yaml

Lines changed: 0 additions & 39 deletions
This file was deleted.

config/default/manager_config_patch.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

config/manager/manager.yaml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,10 @@ spec:
3636
labels:
3737
control-plane: controller-manager
3838
spec:
39-
# TODO(user): Uncomment the following code to configure the nodeAffinity expression
40-
# according to the platforms which are supported by your solution.
41-
# It is considered best practice to support multiple architectures. You can
42-
# build your manager image using the makefile target docker-buildx.
43-
# affinity:
44-
# nodeAffinity:
45-
# requiredDuringSchedulingIgnoredDuringExecution:
46-
# nodeSelectorTerms:
47-
# - matchExpressions:
48-
# - key: kubernetes.io/arch
49-
# operator: In
50-
# values:
51-
# - amd64
52-
# - arm64
53-
# - ppc64le
54-
# - s390x
55-
# - key: kubernetes.io/os
56-
# operator: In
57-
# values:
58-
# - linux
5939
securityContext:
6040
runAsNonRoot: true
61-
# TODO(user): For common cases that do not require escalating privileges
62-
# it is recommended to ensure that all your Pods/Containers are restrictive.
63-
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
64-
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
65-
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
66-
# seccompProfile:
67-
# type: RuntimeDefault
41+
seccompProfile:
42+
type: RuntimeDefault
6843
containers:
6944
- command:
7045
- /manager
@@ -114,8 +89,6 @@ spec:
11489
port: 8081
11590
initialDelaySeconds: 5
11691
periodSeconds: 10
117-
# TODO(user): Configure the resources accordingly based on the project requirements.
118-
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
11992
resources:
12093
limits:
12194
cpu: 500m

config/manifests/kustomization.yaml

Lines changed: 0 additions & 28 deletions
This file was deleted.

config/prometheus/kustomization.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

config/prometheus/monitor.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ require (
1212
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
1313
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3
1414
github.com/aws/smithy-go v1.20.3
15-
github.com/go-jose/go-jose/v4 v4.0.3
16-
github.com/onsi/ginkgo/v2 v2.17.2
15+
github.com/go-jose/go-jose/v4 v4.0.4
16+
github.com/onsi/ginkgo/v2 v2.19.0
1717
github.com/onsi/gomega v1.33.1
1818
github.com/stretchr/testify v1.9.0
1919
k8s.io/api v0.30.3
@@ -95,7 +95,7 @@ require (
9595
gopkg.in/yaml.v3 v3.0.1 // indirect
9696
k8s.io/apiextensions-apiserver v0.30.3 // indirect
9797
k8s.io/klog/v2 v2.130.1 // indirect
98-
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
98+
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
9999
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
100100
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
101101
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
5353
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
5454
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
5555
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
56-
github.com/go-jose/go-jose/v4 v4.0.3 h1:o8aphO8Hv6RPmH+GfzVuyf7YXSBibp+8YyHdOoDESGo=
57-
github.com/go-jose/go-jose/v4 v4.0.3/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
56+
github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
57+
github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
5858
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
5959
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
6060
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -120,8 +120,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
120120
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
121121
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
122122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
123-
github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
124-
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
123+
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
124+
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
125125
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
126126
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
127127
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -222,8 +222,8 @@ k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k=
222222
k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U=
223223
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
224224
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
225-
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f h1:2sXuKesAYbRHxL3aE2PN6zX/gcJr22cjrsej+W784Tc=
226-
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
225+
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e h1:OnKkExfhk4yxMqvBSPzUfhv3zQ96FWJ+UOZzLrAFyAo=
226+
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e/go.mod h1:0CVn9SVo8PeW5/JgsBZZIFmmTk5noOM8WXf2e1tCihE=
227227
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
228228
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
229229
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=

0 commit comments

Comments
 (0)