Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch image references to tags instead of shas #517

Merged
merged 2 commits into from Apr 22, 2020
Merged

Switch image references to tags instead of shas #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c277f7
Switch to using tags instead of sha for images
tmjd Apr 21, 2020
b370577
Switch tests for tags instead of shas
tmjd Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions pkg/components/images_test.go
View file
Open in desktop
Expand Up @@ -21,13 +21,13 @@ import (

var _ = Describe("No registry override", func() {
It("should render a calico image correctly", func() {
Expect(GetReference(ComponentCalicoNode, "", "")).To(Equal("docker.io/calico/node@" + ComponentCalicoNode.Digest))
Expect(GetReference(ComponentCalicoNode, "", "")).To(Equal("docker.io/calico/node:" + ComponentCalicoNode.Version))
})
It("should render a tigera image correctly", func() {
Expect(GetReference(ComponentTigeraNode, "", "")).To(Equal("gcr.io/unique-caldron-775/cnx/tigera/cnx-node@" + ComponentTigeraNode.Digest))
Expect(GetReference(ComponentTigeraNode, "", "")).To(Equal("gcr.io/unique-caldron-775/cnx/tigera/cnx-node:" + ComponentTigeraNode.Version))
})
It("should render an ECK image correctly", func() {
Expect(GetReference(ComponentElasticsearchOperator, "", "")).To(Equal("docker.elastic.co/eck/eck-operator@" + ComponentElasticsearchOperator.Digest))
Expect(GetReference(ComponentElasticsearchOperator, "", "")).To(Equal("docker.elastic.co/eck/eck-operator:" + ComponentElasticsearchOperator.Version))
})
It("should render an operator init image correctly", func() {
Expect(GetOperatorInitReference("", "")).To(Equal("gcr.io/unique-caldron-775/cnx/tigera/operator-init:" + ComponentOperatorInit.Version))
Expand All @@ -36,41 +36,41 @@ var _ = Describe("No registry override", func() {

var _ = Describe("registry override", func() {
It("should render a calico image correctly", func() {
Expect(GetReference(ComponentCalicoNode, "quay.io/", "")).To(Equal("quay.io/calico/node@" + ComponentCalicoNode.Digest))
Expect(GetReference(ComponentCalicoNode, "quay.io/", "")).To(Equal("quay.io/calico/node:" + ComponentCalicoNode.Version))
})
It("should render a tigera image correctly", func() {
Expect(GetReference(ComponentTigeraNode, "quay.io/", "")).To(Equal("quay.io/tigera/cnx-node@" + ComponentTigeraNode.Digest))
Expect(GetReference(ComponentTigeraNode, "quay.io/", "")).To(Equal("quay.io/tigera/cnx-node:" + ComponentTigeraNode.Version))
})
It("should render an ECK image correctly", func() {
Expect(GetReference(ComponentElasticsearchOperator, "quay.io/", "")).To(Equal("quay.io/eck/eck-operator@" + ComponentElasticsearchOperator.Digest))
Expect(GetReference(ComponentElasticsearchOperator, "quay.io/", "")).To(Equal("quay.io/eck/eck-operator:" + ComponentElasticsearchOperator.Version))
})
It("should render an operator init image correctly", func() {
Expect(GetOperatorInitReference("gcr.io/", "")).To(Equal("gcr.io/tigera/operator-init:" + ComponentOperatorInit.Version))
})
})
var _ = Describe("imagepath override", func() {
It("should render a calico image correctly", func() {
Expect(GetReference(ComponentCalicoNode, "", "userpath")).To(Equal("docker.io/userpath/node@" + ComponentCalicoNode.Digest))
Expect(GetReference(ComponentCalicoNode, "", "userpath")).To(Equal("docker.io/userpath/node:" + ComponentCalicoNode.Version))
})
It("should render a tigera image correctly", func() {
Expect(GetReference(ComponentTigeraNode, "", "userpath")).To(Equal("gcr.io/unique-caldron-775/cnx/userpath/cnx-node@" + ComponentTigeraNode.Digest))
Expect(GetReference(ComponentTigeraNode, "", "userpath")).To(Equal("gcr.io/unique-caldron-775/cnx/userpath/cnx-node:" + ComponentTigeraNode.Version))
})
It("should render an ECK image correctly", func() {
Expect(GetReference(ComponentElasticsearchOperator, "", "userpath")).To(Equal("docker.elastic.co/userpath/eck-operator@" + ComponentElasticsearchOperator.Digest))
Expect(GetReference(ComponentElasticsearchOperator, "", "userpath")).To(Equal("docker.elastic.co/userpath/eck-operator:" + ComponentElasticsearchOperator.Version))
})
It("should render an operator init image correctly", func() {
Expect(GetOperatorInitReference("", "userpath")).To(Equal("gcr.io/unique-caldron-775/cnx/userpath/operator-init:" + ComponentOperatorInit.Version))
})
})
var _ = Describe("registry and imagepath override", func() {
It("should render a calico image correctly", func() {
Expect(GetReference(ComponentCalicoNode, "quay.io/extra/", "userpath")).To(Equal("quay.io/extra/userpath/node@" + ComponentCalicoNode.Digest))
Expect(GetReference(ComponentCalicoNode, "quay.io/extra/", "userpath")).To(Equal("quay.io/extra/userpath/node:" + ComponentCalicoNode.Version))
})
It("should render a tigera image correctly", func() {
Expect(GetReference(ComponentTigeraNode, "quay.io/extra/", "userpath")).To(Equal("quay.io/extra/userpath/cnx-node@" + ComponentTigeraNode.Digest))
Expect(GetReference(ComponentTigeraNode, "quay.io/extra/", "userpath")).To(Equal("quay.io/extra/userpath/cnx-node:" + ComponentTigeraNode.Version))
})
It("should render an ECK image correctly", func() {
Expect(GetReference(ComponentElasticsearchOperator, "quay.io/extra/", "userpath")).To(Equal("quay.io/extra/userpath/eck-operator@" + ComponentElasticsearchOperator.Digest))
Expect(GetReference(ComponentElasticsearchOperator, "quay.io/extra/", "userpath")).To(Equal("quay.io/extra/userpath/eck-operator:" + ComponentElasticsearchOperator.Version))
})
It("should render an operator init image correctly", func() {
Expect(GetOperatorInitReference("gcr.io/extra/", "userpath")).To(Equal("gcr.io/extra/userpath/operator-init:" + ComponentOperatorInit.Version))
Expand Down
2 changes: 1 addition & 1 deletion pkg/components/references.go
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ func GetReference(c component, registry, imagepath string) string {
image = ReplaceImagePath(image, imagepath)
}

return fmt.Sprintf("%s%s@%s", registry, image, c.Digest)
return fmt.Sprintf("%s%s:%s", registry, image, c.Version)
}

func ReplaceImagePath(image, imagepath string) string {
Expand Down
4 changes: 2 additions & 2 deletions pkg/render/apiserver_test.go
View file
Open in desktop
Expand Up @@ -154,7 +154,7 @@ var _ = Describe("API server rendering tests", func() {
Expect(len(d.Spec.Template.Spec.Containers)).To(Equal(2))
Expect(d.Spec.Template.Spec.Containers[0].Name).To(Equal("tigera-apiserver"))
Expect(d.Spec.Template.Spec.Containers[0].Image).To(Equal(
fmt.Sprintf("testregistry.com/%s@%s", components.ComponentAPIServer.Image, components.ComponentAPIServer.Digest),
fmt.Sprintf("testregistry.com/%s:%s", components.ComponentAPIServer.Image, components.ComponentAPIServer.Version),
))

expectedArgs := []string{
Expand Down Expand Up @@ -184,7 +184,7 @@ var _ = Describe("API server rendering tests", func() {

Expect(d.Spec.Template.Spec.Containers[1].Name).To(Equal("tigera-queryserver"))
Expect(d.Spec.Template.Spec.Containers[1].Image).To(Equal(
fmt.Sprintf("testregistry.com/%s@%s", components.ComponentQueryServer.Image, components.ComponentQueryServer.Digest),
fmt.Sprintf("testregistry.com/%s:%s", components.ComponentQueryServer.Image, components.ComponentQueryServer.Version),
))
Expect(d.Spec.Template.Spec.Containers[1].Args).To(BeEmpty())
Expect(len(d.Spec.Template.Spec.Containers[1].Env)).To(Equal(2))
Expand Down
2 changes: 1 addition & 1 deletion pkg/render/guardian_test.go
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@ var _ = Describe("Rendering tests", func() {
}

deployment := resources[5].(*appsv1.Deployment)
Expect(deployment.Spec.Template.Spec.Containers[0].Image).Should(Equal("my-reg/tigera/guardian@" + components.ComponentGuardian.Digest))
Expect(deployment.Spec.Template.Spec.Containers[0].Image).Should(Equal("my-reg/tigera/guardian:" + components.ComponentGuardian.Version))
})

})
4 changes: 2 additions & 2 deletions pkg/render/kube-controllers_test.go
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ var _ = Describe("kube-controllers rendering tests", func() {

// Image override results in correct image.
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(
fmt.Sprintf("test-reg/%s@%s", components.ComponentCalicoKubeControllers.Image, components.ComponentCalicoKubeControllers.Digest),
fmt.Sprintf("test-reg/%s:%s", components.ComponentCalicoKubeControllers.Image, components.ComponentCalicoKubeControllers.Version),
))

// Verify env
Expand Down Expand Up @@ -97,7 +97,7 @@ var _ = Describe("kube-controllers rendering tests", func() {
// The Deployment should have the correct configuration.
ds := resources[3].(*apps.Deployment)

Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal("test-reg/tigera/kube-controllers@" + components.ComponentTigeraKubeControllers.Digest))
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal("test-reg/tigera/kube-controllers:" + components.ComponentTigeraKubeControllers.Version))
})

It("should include a ControlPlaneNodeSelector when specified", func() {
Expand Down
6 changes: 3 additions & 3 deletions pkg/render/manager_test.go
View file
Open in desktop
Expand Up @@ -89,9 +89,9 @@ var _ = Describe("Tigera Secure Manager rendering tests", func() {
}

deployment := resources[12].(*appsv1.Deployment)
Expect(deployment.Spec.Template.Spec.Containers[0].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/cnx-manager@" + components.ComponentManager.Digest))
Expect(deployment.Spec.Template.Spec.Containers[1].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/es-proxy@" + components.ComponentEsProxy.Digest))
Expect(deployment.Spec.Template.Spec.Containers[2].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/voltron@" + components.ComponentManagerProxy.Digest))
Expect(deployment.Spec.Template.Spec.Containers[0].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/cnx-manager:" + components.ComponentManager.Version))
Expect(deployment.Spec.Template.Spec.Containers[1].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/es-proxy:" + components.ComponentEsProxy.Version))
Expect(deployment.Spec.Template.Spec.Containers[2].Image).Should(Equal("gcr.io/unique-caldron-775/cnx/tigera/voltron:" + components.ComponentManagerProxy.Version))
})

It("should ensure cnx policy recommendation support is always set to true", func() {
Expand Down
12 changes: 6 additions & 6 deletions pkg/render/node_test.go
View file
Open in desktop
Expand Up @@ -117,16 +117,16 @@ var _ = Describe("Node rendering tests", func() {
ExpectEnv(cniContainer.Env, "CNI_NET_DIR", "/etc/cni/net.d")

// Node image override results in correct image.
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(fmt.Sprintf("docker.io/%s@%s", components.ComponentCalicoNode.Image, components.ComponentCalicoNode.Digest)))
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(fmt.Sprintf("docker.io/%s:%s", components.ComponentCalicoNode.Image, components.ComponentCalicoNode.Version)))

// Validate correct number of init containers.
Expect(len(ds.Spec.Template.Spec.InitContainers)).To(Equal(2))

// CNI container uses image override.
Expect(GetContainer(ds.Spec.Template.Spec.InitContainers, "install-cni").Image).To(Equal(fmt.Sprintf("docker.io/%s@%s", components.ComponentCalicoCNI.Image, components.ComponentCalicoCNI.Digest)))
Expect(GetContainer(ds.Spec.Template.Spec.InitContainers, "install-cni").Image).To(Equal(fmt.Sprintf("docker.io/%s:%s", components.ComponentCalicoCNI.Image, components.ComponentCalicoCNI.Version)))

// Verify the Flex volume container image.
Expect(GetContainer(ds.Spec.Template.Spec.InitContainers, "flexvol-driver").Image).To(Equal(fmt.Sprintf("docker.io/%s@%s", components.ComponentFlexVolume.Image, components.ComponentFlexVolume.Digest)))
Expect(GetContainer(ds.Spec.Template.Spec.InitContainers, "flexvol-driver").Image).To(Equal(fmt.Sprintf("docker.io/%s:%s", components.ComponentFlexVolume.Image, components.ComponentFlexVolume.Version)))

optional := true
// Verify env
Expand Down Expand Up @@ -285,7 +285,7 @@ var _ = Describe("Node rendering tests", func() {

// The DaemonSet should have the correct configuration.
ds := dsResource.(*apps.DaemonSet)
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(components.TigeraRegistry + "tigera/cnx-node@" + components.ComponentTigeraNode.Digest))
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(components.TigeraRegistry + "tigera/cnx-node:" + components.ComponentTigeraNode.Version))
ExpectEnv(GetContainer(ds.Spec.Template.Spec.InitContainers, "install-cni").Env, "CNI_NET_DIR", "/etc/cni/net.d")

optional := true
Expand Down Expand Up @@ -376,7 +376,7 @@ var _ = Describe("Node rendering tests", func() {

// The DaemonSet should have the correct configuration.
ds := dsResource.(*apps.DaemonSet)
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(fmt.Sprintf("docker.io/%s@%s", components.ComponentCalicoNode.Image, components.ComponentCalicoNode.Digest)))
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(fmt.Sprintf("docker.io/%s:%s", components.ComponentCalicoNode.Image, components.ComponentCalicoNode.Version)))

ExpectEnv(GetContainer(ds.Spec.Template.Spec.InitContainers, "install-cni").Env, "CNI_NET_DIR", "/var/run/multus/cni/net.d")

Expand Down Expand Up @@ -497,7 +497,7 @@ var _ = Describe("Node rendering tests", func() {

// The DaemonSet should have the correct configuration.
ds := dsResource.(*apps.DaemonSet)
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(components.TigeraRegistry + "tigera/cnx-node@" + components.ComponentTigeraNode.Digest))
Expect(ds.Spec.Template.Spec.Containers[0].Image).To(Equal(components.TigeraRegistry + "tigera/cnx-node:" + components.ComponentTigeraNode.Version))

ExpectEnv(GetContainer(ds.Spec.Template.Spec.InitContainers, "install-cni").Env, "CNI_NET_DIR", "/var/run/multus/cni/net.d")

Expand Down