opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15607 from fpoirotte/main

Browse Source 
Fix #15243 Set AutomountServiceAccountToken to false
This commit is contained in:
OpenShift Merge Robot
2022-09-08 19:38:56 +02:00
committed by GitHub
parent 7e2f002b07 71978b0a0c
commit 6d8bafe57a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/kube.go
View File

@ -470,6 +470,8 @@ func newPodObject(podName string, annotations map[string]string, initCtrs, conta
} }
// Set enableServiceLinks to false as podman doesn't use the service port environment variables // Set enableServiceLinks to false as podman doesn't use the service port environment variables
enableServiceLinks := false enableServiceLinks := false
// Set automountServiceAccountToken to false as podman doesn't use service account tokens
automountServiceAccountToken := false
ps := v1.PodSpec{ ps := v1.PodSpec{
Containers: containers, Containers: containers,
Hostname: hostname, Hostname: hostname,
@ -477,6 +479,7 @@ func newPodObject(podName string, annotations map[string]string, initCtrs, conta
InitContainers: initCtrs, InitContainers: initCtrs,
Volumes: volumes, Volumes: volumes,
EnableServiceLinks: &enableServiceLinks, EnableServiceLinks: &enableServiceLinks,
AutomountServiceAccountToken: &automountServiceAccountToken,
} }
if dnsOptions != nil && (len(dnsOptions.Nameservers)+len(dnsOptions.Searches)+len(dnsOptions.Options) > 0) { if dnsOptions != nil && (len(dnsOptions.Nameservers)+len(dnsOptions.Searches)+len(dnsOptions.Options) > 0) {
ps.DNSConfig = dnsOptions ps.DNSConfig = dnsOptions

4
test/e2e/generate_kube_test.go
View File

@ -73,6 +73,8 @@ var _ = Describe("Podman generate kube", func() {
Expect(pod).To(HaveField("Name", "top-pod")) Expect(pod).To(HaveField("Name", "top-pod"))
enableServiceLinks := false enableServiceLinks := false
Expect(pod.Spec).To(HaveField("EnableServiceLinks", &enableServiceLinks)) Expect(pod.Spec).To(HaveField("EnableServiceLinks", &enableServiceLinks))
automountServiceAccountToken := false
Expect(pod.Spec).To(HaveField("AutomountServiceAccountToken", &automountServiceAccountToken))
numContainers := 0 numContainers := 0
for range pod.Spec.Containers { for range pod.Spec.Containers {
@ -169,6 +171,8 @@ var _ = Describe("Podman generate kube", func() {
Expect(pod.Spec).To(HaveField("HostNetwork", false)) Expect(pod.Spec).To(HaveField("HostNetwork", false))
enableServiceLinks := false enableServiceLinks := false
Expect(pod.Spec).To(HaveField("EnableServiceLinks", &enableServiceLinks)) Expect(pod.Spec).To(HaveField("EnableServiceLinks", &enableServiceLinks))
automountServiceAccountToken := false
Expect(pod.Spec).To(HaveField("AutomountServiceAccountToken", &automountServiceAccountToken))
numContainers := 0 numContainers := 0
for range pod.Spec.Containers { for range pod.Spec.Containers {