panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch busybox image to cgr.dev/chainguard/busybox:latest-glibc (#175)

Browse Source
This commit is contained in:
Marco Franssen
2023-04-03 05:33:30 -07:00
committed by GitHub
parent 87904164ad
commit a7709287bf
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/tests/extras/values.yaml
+4 -4
View File
@@ -1,7 +1,7 @@
spire-agent: spire-agent:
initContainers: initContainers:
- name: extra-init - name: extra-init
image: busybox image: cgr.dev/chainguard/busybox:latest-glibc
command: command:
- sh - sh
- -xec - -xec
@@ -12,7 +12,7 @@ spire-agent:
mountPath: /extra mountPath: /extra
extraContainers: extraContainers:
- name: extra - name: extra
image: busybox image: cgr.dev/chainguard/busybox:latest-glibc
command: command:
- sh - sh
- -xec - -xec
@@ -32,7 +32,7 @@ spire-agent:
spire-server: spire-server:
initContainers: initContainers:
- name: extra-init - name: extra-init
image: busybox image: cgr.dev/chainguard/busybox:latest-glibc
command: command:
- sh - sh
- -xec - -xec
@@ -43,7 +43,7 @@ spire-server:
mountPath: /extra mountPath: /extra
extraContainers: extraContainers:
- name: extra - name: extra
image: busybox image: cgr.dev/chainguard/busybox:latest-glibc
command: command:
- sh - sh
- -xec - -xec
charts/spire/charts/spiffe-oidc-discovery-provider/templates/tests/test-connection.yaml
+4 -4
View File
@@ -12,26 +12,26 @@ spec:
{{- toYaml .Values.podSecurityContext | nindent 4 }} {{- toYaml .Values.podSecurityContext | nindent 4 }}
containers: containers:
- name: wget-service-name - name: wget-service-name
image: busybox image: cgr.dev/chainguard/bash:latest
command: ['wget'] command: ['wget']
args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}:{{ .Values.service.port }}/.well-known/openid-configuration'] args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}:{{ .Values.service.port }}/.well-known/openid-configuration']
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 8 }} {{- toYaml .Values.securityContext | nindent 8 }}
- name: wget-service-name-namespace - name: wget-service-name-namespace
image: busybox image: cgr.dev/chainguard/bash:latest
command: ['wget'] command: ['wget']
args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}:{{ .Values.service.port }}/.well-known/openid-configuration'] args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}:{{ .Values.service.port }}/.well-known/openid-configuration']
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 8 }} {{- toYaml .Values.securityContext | nindent 8 }}
- name: wget-service-name-namespace-svc-cluster-local - name: wget-service-name-namespace-svc-cluster-local
image: busybox image: cgr.dev/chainguard/bash:latest
command: ['wget'] command: ['wget']
args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}.svc.cluster.local:{{ .Values.service.port }}/.well-known/openid-configuration'] args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}.svc.cluster.local:{{ .Values.service.port }}/.well-known/openid-configuration']
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 8 }} {{- toYaml .Values.securityContext | nindent 8 }}
{{- if .Values.ingress.enabled }} {{- if .Values.ingress.enabled }}
- name: wget-ingress - name: wget-ingress
image: busybox image: cgr.dev/chainguard/bash:latest
command: ['wget'] command: ['wget']
args: ['-O', '/dev/null', '{{ index .Values.config.domains 0 }}/.well-known/openid-configuration'] args: ['-O', '/dev/null', '{{ index .Values.config.domains 0 }}/.well-known/openid-configuration']
securityContext: securityContext:
charts/spire/charts/spire-server/templates/tests/test-connection.yaml
+6 -6
View File
@@ -11,17 +11,17 @@ spec:
securityContext: securityContext:
{{- toYaml .Values.podSecurityContext | nindent 4 }} {{- toYaml .Values.podSecurityContext | nindent 4 }}
containers: containers:
- name: wget - name: netcat
image: busybox image: cgr.dev/chainguard/bash:latest
command: ['nc'] command: ['nc']
args: ['-zvw3', '{{ include "spire-server.fullname" . }}', '{{ .Values.service.port }}'] args: ['-zvw3', '{{ include "spire-server.fullname" . }}', '{{ .Values.service.port }}']
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 8 }} {{- toYaml .Values.securityContext | nindent 8 }}
{{- if eq (.Values.federation.enabled | toString) "true" }} {{- if eq (.Values.federation.enabled | toString) "true" }}
- name: wget-federation-bundle-endpoint - name: curl-federation-bundle-endpoint
image: busybox image: cgr.dev/chainguard/bash:latest
command: ['wget'] command: ['curl']
args: ['--no-check-certificate', '-O', '/dev/null', 'https://{{ include "spire-server.fullname" . }}.{{ include "spire-server.namespace" . }}.svc.cluster.local:{{ .Values.federation.bundleEndpoint.port }}'] args: ['-k', '-s', '-f', 'https://{{ include "spire-server.fullname" . }}.{{ include "spire-server.namespace" . }}.svc.cluster.local:{{ .Values.federation.bundleEndpoint.port }}']
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 8 }} {{- toYaml .Values.securityContext | nindent 8 }}
{{- end }} {{- end }}