Skip to content

Commit

Permalink
Three manual fixes
Browse files Browse the repository at this point in the history
Two for this error:

    invalid indirect of pod.Spec.DNSConfig.Options[0]

...and one for a gofmt error (spaces).

Signed-off-by: Ed Santiago <[email protected]>
  • Loading branch information
edsantiago committed Apr 28, 2022
1 parent b3f38c3 commit a5aea8e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion test/e2e/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ var _ = Describe("Podman create", func() {
inspect.WaitWithDefaultTimeout()
data := inspect.InspectContainerToJSON()
Expect(data).To(HaveLen(1))
Expect(data[0].HostConfig).To(HaveField("MemorySwap", int64(2 * numMem)))
Expect(data[0].HostConfig).To(HaveField("MemorySwap", int64(2*numMem)))
})

It("podman create --cpus 5 sets nanocpus", func() {
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/generate_kube_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,8 @@ var _ = Describe("Podman generate kube", func() {
Expect(pod.Spec.DNSConfig.Searches).To(ContainElement("foobar.com"))
Expect(len(pod.Spec.DNSConfig.Options)).To(BeNumerically(">", 0))
Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Name", "color"))
Expect(*pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", "blue"))
s := "blue"
Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", &s))
})

It("podman generate kube multiple container dns servers and options are cumulative", func() {
Expand Down Expand Up @@ -820,7 +821,8 @@ var _ = Describe("Podman generate kube", func() {
Expect(pod.Spec.DNSConfig.Searches).To(ContainElement("foobar.com"))
Expect(len(pod.Spec.DNSConfig.Options)).To(BeNumerically(">", 0))
Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Name", "color"))
Expect(*pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", "blue"))
s := "blue"
Expect(pod.Spec.DNSConfig.Options[0]).To(HaveField("Value", &s))
})

It("podman generate kube - set entrypoint as command", func() {
Expand Down

0 comments on commit a5aea8e

Please sign in to comment.