Skip to content

Commit c586d41

Browse files
slariviereslariviere
authored
Merge branch 'main' into fix/hubble-surface-manager-start-failure
2 parents 98546cc + 4db44ab commit c586d41

9 files changed

Lines changed: 38 additions & 29 deletions

File tree

‎.github/workflows/images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ jobs:
374374
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
375375

376376
- name: Setup QEMU
377-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
377+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
378378

379379
- name: Azure CLI login
380380
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0

‎.github/workflows/release-images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ jobs:
325325
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
326326

327327
- name: Set up QEMU
328-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
328+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
329329

330330
- name: Install Cosign
331331
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2

‎deploy/hubble/manifests/controller/helm/retina/templates/agent/clusterrole.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
{{- if .Values.agent.enabled -}}
1+
{{- if and .Values.agent.enabled .Values.serviceAccount.create -}}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
namespace: {{ .Values.namespace }}
65
name: retina-cluster-reader
76
rules:
87
- apiGroups: [""] # "" indicates the core API group

‎deploy/hubble/manifests/controller/helm/retina/templates/agent/clusterrolebinding.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
{{- if .Values.agent.enabled -}}
1+
{{- if and .Values.agent.enabled .Values.serviceAccount.create -}}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: retina-cluster-reader-binding
66
namespace: {{ .Values.namespace }}
77
subjects:
88
- kind: ServiceAccount
9-
name: retina-agent
9+
name: {{ .Values.serviceAccount.name }}
1010
namespace: {{ .Values.namespace }}
1111
roleRef:
1212
kind: ClusterRole
1313
name: retina-cluster-reader
1414
apiGroup: rbac.authorization.k8s.io
1515

16-
{{- end}}
16+
{{- end}}

‎deploy/hubble/manifests/controller/helm/retina/templates/agent/daemonset.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ spec:
2424
spec:
2525
hostNetwork: true
2626
serviceAccountName: {{ .Values.serviceAccount.name }}
27+
automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
2728
{{- if .Values.priorityClassName }}
2829
priorityClassName: {{ .Values.priorityClassName }}
2930
{{- end }}
@@ -57,7 +58,7 @@ spec:
5758
- name: tmp
5859
mountPath: /tmp
5960
containers:
60-
- name: {{ include "retina.name" . }}
61+
- name: {{ include "retina.name" . }}
6162
image: {{ .Values.agent.repository }}:{{ .Values.agent.tag }}
6263
imagePullPolicy: {{ .Values.agent.pullPolicy }}
6364
{{- if .Values.agent.container.retina.command }}
@@ -203,13 +204,14 @@ spec:
203204
namespace: {{ .Values.namespace }}
204205
spec:
205206
serviceAccountName: {{ .Values.serviceAccount.name }}
207+
automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
206208
{{- with .Values.imagePullSecrets }}
207209
{{- if .Values.priorityClassName }}
208210
priorityClassName: {{ .Values.priorityClassName }}
209211
{{- end }}
210212
imagePullSecrets:
211213
{{- toYaml . | nindent 8 }}
212-
{{- end }}
214+
{{- end }}
213215
securityContext:
214216
windowsOptions:
215217
hostProcess: true

‎deploy/hubble/manifests/controller/helm/retina/templates/agent/serviceaccount.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
{{- if .Values.agent.enabled -}}
1+
{{- if and .Values.agent.enabled .Values.serviceAccount.create -}}
22
apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: {{ .Values.serviceAccount.name }}
66
namespace: {{ .Values.namespace }}
7+
{{- if .Values.serviceAccount.annotations }}
8+
annotations:
9+
{{- with .Values.serviceAccount.annotations }}
10+
{{- toYaml . | nindent 4 }}
11+
{{- end }}
12+
{{- end }}
713

8-
{{- end}}
14+
{{- end }}

‎deploy/hubble/manifests/controller/helm/retina/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ service:
150150
serviceAccount:
151151
annotations: {}
152152
name: "retina-agent"
153+
create: true
154+
automount: true
153155

154156
resources:
155157
requests:

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/spf13/cobra v1.10.2
1010
go.uber.org/zap v1.28.0
1111
k8s.io/client-go v0.35.4
12-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.20.4
12+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.20.5
1313
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.14.0
1414
)
1515

@@ -54,7 +54,7 @@ require (
5454
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23 // indirect
5555
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.23 // indirect
5656
github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.0 // indirect
5858
github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 // indirect
5959
github.com/aws/smithy-go v1.25.1 // indirect
6060
github.com/beorn7/perks v1.0.1 // indirect
@@ -167,7 +167,7 @@ require (
167167
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
168168
go.uber.org/dig v1.17.1 // indirect
169169
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
170-
golang.org/x/crypto v0.51.0 // indirect
170+
golang.org/x/crypto v0.52.0 // indirect
171171
golang.org/x/mod v0.36.0
172172
golang.org/x/text v0.37.0 // indirect
173173
golang.org/x/time v0.15.0 // indirect
@@ -194,7 +194,7 @@ require (
194194
github.com/spf13/pflag v1.0.10
195195
github.com/stretchr/testify v1.11.1
196196
go.uber.org/multierr v1.11.0 // indirect
197-
golang.org/x/net v0.54.0 // indirect
197+
golang.org/x/net v0.55.0 // indirect
198198
golang.org/x/oauth2 v0.36.0 // indirect
199199
golang.org/x/sync v0.20.0
200200
golang.org/x/sys v0.45.0
@@ -224,8 +224,8 @@ require (
224224
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.7.0
225225
github.com/Microsoft/hcsshim v0.14.1
226226
github.com/aws/aws-sdk-go-v2 v1.41.7
227-
github.com/aws/aws-sdk-go-v2/config v1.32.17
228-
github.com/aws/aws-sdk-go-v2/credentials v1.19.16
227+
github.com/aws/aws-sdk-go-v2/config v1.32.18
228+
github.com/aws/aws-sdk-go-v2/credentials v1.19.17
229229
github.com/aws/aws-sdk-go-v2/service/s3 v1.101.0
230230
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
231231
github.com/cilium/cilium v1.19.3

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6t
257257
github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc=
258258
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.10 h1:gx1AwW1Iyk9Z9dD9F4akX5gnN3QZwUB20GGKH/I+Rho=
259259
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.10/go.mod h1:qqY157uZoqm5OXq/amuaBJyC9hgBCBQnsaWnPe905GY=
260-
github.com/aws/aws-sdk-go-v2/config v1.32.17 h1:FpL4/758/diKwqbytU0prpuiu60fgXKUWCpDJtApclU=
261-
github.com/aws/aws-sdk-go-v2/config v1.32.17/go.mod h1:OXqUMzgXytfoF9JaKkhrOYsyh72t9G+MJH8mMRaexOE=
262-
github.com/aws/aws-sdk-go-v2/credentials v1.19.16 h1:r3RJBuU7X9ibt8RHbMjWE6y60QbKBiII6wSrXnapxSU=
263-
github.com/aws/aws-sdk-go-v2/credentials v1.19.16/go.mod h1:6cx7zqDENJDbBIIWX6P8s0h6hqHC8Avbjh9Dseo27ug=
260+
github.com/aws/aws-sdk-go-v2/config v1.32.18 h1:Hcia46bxhGgF3BaSnG8nSNCWmqTK6bj9xN9/FJ3WK6Q=
261+
github.com/aws/aws-sdk-go-v2/config v1.32.18/go.mod h1:zEjCAYmxqDadH1WX8CdBvmLKhUEUVFgKRQG38zjDmrY=
262+
github.com/aws/aws-sdk-go-v2/credentials v1.19.17 h1:gP2nkGsS+KMvF/jfFz2Vv2qiiOqWKyPACSzPsqHgoW8=
263+
github.com/aws/aws-sdk-go-v2/credentials v1.19.17/go.mod h1:Bsew3S/moG5iT77giPj1q8wb/s0RE5/QfH+ASjYtuQc=
264264
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 h1:UuSfcORqNSz/ey3VPRS8TcVH2Ikf0/sC+Hdj400QI6U=
265265
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23/go.mod h1:+G/OSGiOFnSOkYloKj/9M35s74LgVAdJBSD5lsFfqKg=
266266
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.21.1 h1:1hWFp+52Vq8Fevy/KUhbW/1MEApMz7uitCF/PQXRJpk=
@@ -291,8 +291,8 @@ github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 h1:TdJ+HdzOBhU8+iVAOGUTU63VX
291291
github.com/aws/aws-sdk-go-v2/service/signin v1.0.11/go.mod h1:R82ZRExE/nheo0N+T8zHPcLRTcH8MGsnR3BiVGX0TwI=
292292
github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 h1:7byT8HUWrgoRp6sXjxtZwgOKfhss5fW6SkLBtqzgRoE=
293293
github.com/aws/aws-sdk-go-v2/service/sso v1.30.17/go.mod h1:xNWknVi4Ezm1vg1QsB/5EWpAJURq22uqd38U8qKvOJc=
294-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 h1:+1Kl1zx6bWi4X7cKi3VYh29h8BvsCoHQEQ6ST9X8w7w=
295-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21/go.mod h1:4vIRDq+CJB2xFAXZ+YgGUTiEft7oAQlhIs71xcSeuVg=
294+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.0 h1:nDARhv/oF55bcxF7rCI/4PDxOKnVXVWwDuDwCs2I2SQ=
295+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.0/go.mod h1:4vIRDq+CJB2xFAXZ+YgGUTiEft7oAQlhIs71xcSeuVg=
296296
github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 h1:F/M5Y9I3nwr2IEpshZgh1GeHpOItExNM9L1euNuh/fk=
297297
github.com/aws/aws-sdk-go-v2/service/sts v1.42.1/go.mod h1:mTNxImtovCOEEuD65mKW7DCsL+2gjEH+RPEAexAzAio=
298298
github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI=
@@ -1716,8 +1716,8 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
17161716
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
17171717
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
17181718
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
1719-
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
1720-
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
1719+
golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
1720+
golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
17211721
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
17221722
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
17231723
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
@@ -1774,8 +1774,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
17741774
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
17751775
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
17761776
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
1777-
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
1778-
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
1777+
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
1778+
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
17791779
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
17801780
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
17811781
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
@@ -2027,8 +2027,8 @@ oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
20272027
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
20282028
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
20292029
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
2030-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.20.4 h1:UOxIkkOqrkrucdVW+N0ZyDUPL+7eZHPeJ9KYw2FXkDQ=
2031-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.20.4/go.mod h1:qLMV2RATHSfIH8DhLRdvCxYdPDwLUgAAx4iDrMRvLRg=
2030+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.20.5 h1:7sVtmuEPEeyeaSaLx8at6zACLVpj7plsAyNbu4Y9AtI=
2031+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.20.5/go.mod h1:AYrejoOSyZYDpUjGesSHP4ILEpbbOTm3tzw7mPxpKJw=
20322032
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.14.0 h1:yjbZWgLUgTnLCGxM8I88l88WgvLRIOcOmAEbacFVLnU=
20332033
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.14.0/go.mod h1:6NYpRYlC7AyQaDtOQsF62plL1gDQqJwgQUwTdjp8qlU=
20342034
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=

0 commit comments

Comments
 (0)