Skip to content

Commit e1fec9a

Browse files
slariviereslariviere
authored
Merge branch 'main' into fix/hubble-surface-manager-start-failure
2 parents c586d41 + d88a8a6 commit e1fec9a

19 files changed

Lines changed: 42 additions & 32 deletions

File tree

‎.github/workflows/devcontainer.yaml‎

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

3030
- name: Build and validate devcontainer
31-
uses: devcontainers/ci@b63b30de439b47a52267f241112c5b453b673db5 # v0.3.1900000449
31+
uses: devcontainers/ci@513af61f4de4f75d37e4438f184ba4358f0fc1ca # v0.3.1900000450
3232
with:
3333
runCmd: |
3434
clang --version

‎cli/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-azurelinux3.0 --format "{{.Name}}@{{.Digest}}"
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-1-azurelinux3.0@sha256:ef480755a4126131197d7311ab1e24d55600407194b45349c4975b7ed0d176e6 AS builder
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.4-1-azurelinux3.0@sha256:5f95bf70f4c437de4a6ba1f72ef1532f69fca392c131fff2172993cabbea359c AS builder
33

44
ARG VERSION
55
ARG APP_INSIGHTS_ID
@@ -25,7 +25,7 @@ RUN --mount=type=cache,target="/root/.cache/go-build" \
2525
# minimal libs stage — provides only the system libraries needed by the CGO-enabled binary,
2626
# without the bloat of the full Go SDK image (python, gcc, systemd, etc.)
2727
# skopeo inspect docker://mcr.microsoft.com/azurelinux/base/core:3.0 --format "{{.Name}}@{{.Digest}}"
28-
FROM mcr.microsoft.com/azurelinux/base/core:3.0.20260517@sha256:f5e224c47997aa4a5d3d8addfcc3866e175e7026368a71ce1be2c0eed1876f04 AS libs
28+
FROM mcr.microsoft.com/azurelinux/base/core:3.0.20260519@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS libs
2929

3030
# Target 1: Distroless (secure, minimal)
3131
# skopeo inspect docker://mcr.microsoft.com/azurelinux/distroless/minimal:3.0 --format "{{.Name}}@{{.Digest}}"
@@ -38,7 +38,7 @@ COPY --from=builder /workspace/kubectl-retina .
3838

3939
# Target 2: Shell-enabled (operational, init container support)
4040
# skopeo inspect docker://mcr.microsoft.com/azurelinux/base/core:3.0 --format "{{.Name}}@{{.Digest}}"
41-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/azurelinux/base/core:3.0.20260517@sha256:f5e224c47997aa4a5d3d8addfcc3866e175e7026368a71ce1be2c0eed1876f04 AS shell-target
41+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/azurelinux/base/core:3.0.20260519@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS shell-target
4242
WORKDIR /
4343
COPY --from=builder /workspace/kubectl-retina /bin/kubectl-retina
4444
RUN chmod +x /bin/kubectl-retina

‎controller/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# pinned base images
22

33
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-azurelinux3.0 --format "{{.Name}}@{{.Digest}}"
4-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-1-azurelinux3.0@sha256:ef480755a4126131197d7311ab1e24d55600407194b45349c4975b7ed0d176e6 AS golang
4+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.4-1-azurelinux3.0@sha256:5f95bf70f4c437de4a6ba1f72ef1532f69fca392c131fff2172993cabbea359c AS golang
55

66
# skopeo inspect docker://mcr.microsoft.com/azurelinux/base/core:3.0 --format "{{.Name}}@{{.Digest}}"
7-
FROM mcr.microsoft.com/azurelinux/base/core:3.0.20260517@sha256:f5e224c47997aa4a5d3d8addfcc3866e175e7026368a71ce1be2c0eed1876f04 AS azurelinux-core
7+
FROM mcr.microsoft.com/azurelinux/base/core:3.0.20260519@sha256:2d83ae6e0d21cd58973633948d903038679f70fb594d6565626f29ddc162fe0c AS azurelinux-core
88

99
# skopeo inspect docker://mcr.microsoft.com/azurelinux/distroless/minimal:3.0 --format "{{.Name}}@{{.Digest}}"
1010
FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0.20260517@sha256:0c64ab9cfc44d4f100c0590bd59ead9afedda6cc54f14bb7465b5f9c35ddc037 AS azurelinux-distroless

‎controller/Dockerfile.gogen‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-azurelinux3.0 --format "{{.Name}}@{{.Digest}}"
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-1-azurelinux3.0@sha256:ef480755a4126131197d7311ab1e24d55600407194b45349c4975b7ed0d176e6
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.4-1-azurelinux3.0@sha256:5f95bf70f4c437de4a6ba1f72ef1532f69fca392c131fff2172993cabbea359c
33

44
# Default linux/architecture.
55
ARG GOOS=linux

‎controller/Dockerfile.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-azurelinux3.0 --format "{{.Name}}@{{.Digest}}"
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-1-azurelinux3.0@sha256:ef480755a4126131197d7311ab1e24d55600407194b45349c4975b7ed0d176e6
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.26.4-1-azurelinux3.0@sha256:5f95bf70f4c437de4a6ba1f72ef1532f69fca392c131fff2172993cabbea359c
33

44
LABEL Name=retina-builder Version=0.0.1
55

‎controller/Dockerfile.windows-cgo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-windowsservercore-ltsc2022 --override-os windows --format "{{.Name}}@{{.Digest}}"
2-
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-1-windowsservercore-ltsc2022@sha256:7ebc4adb9d8a8359d3d0fb6d1479962fdab5b275045e78d70e4b7cdf8f76455b AS cgo
2+
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.26.4-1-windowsservercore-ltsc2022@sha256:e73cd71b61ac81e0e8be3b047f7ab5d05cd1262caa1858d855ed744cea1bd89c AS cgo
33

44
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
55

‎controller/Dockerfile.windows-native‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Maybe one day: https://github.com/moby/buildkit/issues/616
55
ARG BUILDER_IMAGE
66
# skopeo inspect docker://mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-windowsservercore-ltsc2022 --override-os windows --format "{{.Name}}@{{.Digest}}"
7-
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-1-windowsservercore-ltsc2022@sha256:7ebc4adb9d8a8359d3d0fb6d1479962fdab5b275045e78d70e4b7cdf8f76455b AS builder
7+
FROM --platform=windows/amd64 mcr.microsoft.com/oss/go/microsoft/golang:1.26.4-1-windowsservercore-ltsc2022@sha256:e73cd71b61ac81e0e8be3b047f7ab5d05cd1262caa1858d855ed744cea1bd89c AS builder
88
WORKDIR C:\\retina
99
COPY go.mod .
1010
COPY go.sum .

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
namespace: {{ .Values.namespace }}
99
labels:
1010
k8s-app: {{ include "retina.name" . }}
11+
app.kubernetes.io/name: {{ include "retina.name" . }}
12+
app.kubernetes.io/instance: {{ .Release.Name }}
1113
spec:
1214
selector:
1315
matchLabels:
@@ -17,6 +19,8 @@ spec:
1719
labels:
1820
app: {{ include "retina.name" . }}
1921
k8s-app: {{ include "retina.name" . }}
22+
app.kubernetes.io/name: {{ include "retina.name" . }}
23+
app.kubernetes.io/instance: {{ .Release.Name }}
2024
annotations:
2125
prometheus.io/port: "{{ .Values.retinaPort }}"
2226
prometheus.io/scrape: "true"

‎deploy/hubble/manifests/controller/helm/retina/templates/hubble-relay/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metadata:
1212
k8s-app: hubble-relay
1313
app.kubernetes.io/name: hubble-relay
1414
app.kubernetes.io/part-of: cilium
15+
app.kubernetes.io/instance: {{ .Release.Name }}
1516
spec:
1617
replicas: {{ .Values.hubble.relay.replicas }}
1718
selector:
@@ -35,6 +36,7 @@ spec:
3536
k8s-app: hubble-relay
3637
app.kubernetes.io/name: hubble-relay
3738
app.kubernetes.io/part-of: cilium
39+
app.kubernetes.io/instance: {{ .Release.Name }}
3840
{{- with .Values.hubble.relay.podLabels }}
3941
{{- toYaml . | nindent 8 }}
4042
{{- end }}

‎deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metadata:
1212
k8s-app: hubble-ui
1313
app.kubernetes.io/name: hubble-ui
1414
app.kubernetes.io/part-of: cilium
15+
app.kubernetes.io/instance: {{ .Release.Name }}
1516
spec:
1617
replicas: {{ .Values.hubble.ui.replicas }}
1718
selector:
@@ -35,6 +36,7 @@ spec:
3536
k8s-app: hubble-ui
3637
app.kubernetes.io/name: hubble-ui
3738
app.kubernetes.io/part-of: cilium
39+
app.kubernetes.io/instance: {{ .Release.Name }}
3840
{{- with .Values.hubble.ui.podLabels }}
3941
{{- toYaml . | nindent 8 }}
4042
{{- end }}

0 commit comments

Comments
 (0)