mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-30 19:54:46 +00:00
Code Activity

Merge pull request #996 from fmuyassarov/parametirize-image

Browse source 
E2E: parameterize container image and tag
This commit is contained in:
Kubernetes Prow Robot 2022-12-15 08:35:37 -08:00 • committed by GitHub
commit 8d2adfd1f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
test/e2e/node_feature_discovery.go
View file

@ -47,8 +47,9 @@ import (
) )
var ( var (
dockerRepo = flag.String("nfd.repo", "gcr.io/k8s-staging-nfd/node-feature-discovery", "Docker repository to fetch image from") dockerRepo = flag.String("nfd.repo", "gcr.io/k8s-staging-nfd/node-feature-discovery", "Docker repository to fetch image from")
dockerTag = flag.String("nfd.tag", "master", "Docker tag to use") dockerTag = flag.String("nfd.tag", "master", "Docker tag to use")
dockerImage = fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)
) )
// cleanupNode deletes all NFD-related metadata from the Node object, i.e. // cleanupNode deletes all NFD-related metadata from the Node object, i.e.
@ -151,7 +152,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
// Launch nfd-master // Launch nfd-master
By("Creating nfd master pod and nfd-master service") By("Creating nfd master pod and nfd-master service")
imageOpt := testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)) imageOpt := testpod.SpecWithContainerImage(dockerImage)
masterPod = e2epod.NewPodClient(f).CreateSync(testpod.NFDMaster(imageOpt)) masterPod = e2epod.NewPodClient(f).CreateSync(testpod.NFDMaster(imageOpt))
// Create nfd-master service // Create nfd-master service
@ -197,7 +198,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
By("Creating a nfd worker pod") By("Creating a nfd worker pod")
podSpecOpts := []testpod.SpecOption{ podSpecOpts := []testpod.SpecOption{
testpod.SpecWithRestartPolicy(corev1.RestartPolicyNever), testpod.SpecWithRestartPolicy(corev1.RestartPolicyNever),
testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)), testpod.SpecWithContainerImage(dockerImage),
testpod.SpecWithContainerExtraArgs("-oneshot", "-label-sources=fake"), testpod.SpecWithContainerExtraArgs("-oneshot", "-label-sources=fake"),
} }
workerPod := testpod.NFDWorker(podSpecOpts...) workerPod := testpod.NFDWorker(podSpecOpts...)
@ -246,7 +247,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
fConf := cfg.DefaultFeatures fConf := cfg.DefaultFeatures
By("Creating nfd-worker daemonset") By("Creating nfd-worker daemonset")
podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag))} podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(dockerImage)}
workerDS := testds.NFDWorker(podSpecOpts...) workerDS := testds.NFDWorker(podSpecOpts...)
workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{}) workerDS, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(context.TODO(), workerDS, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -377,7 +378,7 @@ var _ = SIGDescribe("Node Feature Discovery", func() {
By("Creating nfd-worker daemonset with configmap mounted") By("Creating nfd-worker daemonset with configmap mounted")
podSpecOpts := []testpod.SpecOption{ podSpecOpts := []testpod.SpecOption{
testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)), testpod.SpecWithContainerImage(dockerImage),
testpod.SpecWithConfigMap(cm1.Name, filepath.Join(custom.Directory, "cm1")), testpod.SpecWithConfigMap(cm1.Name, filepath.Join(custom.Directory, "cm1")),
testpod.SpecWithConfigMap(cm2.Name, filepath.Join(custom.Directory, "cm2")), testpod.SpecWithConfigMap(cm2.Name, filepath.Join(custom.Directory, "cm2")),
} }
@ -439,7 +440,7 @@ core:
By("Creating nfd-worker daemonset") By("Creating nfd-worker daemonset")
podSpecOpts := []testpod.SpecOption{ podSpecOpts := []testpod.SpecOption{
testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)), testpod.SpecWithContainerImage(dockerImage),
testpod.SpecWithConfigMap(cm.Name, "/etc/kubernetes/node-feature-discovery"), testpod.SpecWithConfigMap(cm.Name, "/etc/kubernetes/node-feature-discovery"),
} }
workerDS := testds.NFDWorker(podSpecOpts...) workerDS := testds.NFDWorker(podSpecOpts...)

4
test/e2e/topology_updater.go
View file

@ -115,7 +115,7 @@ var _ = SIGDescribe("Node Feature Discovery topology updater", func() {
kcfg := cfg.GetKubeletConfig() kcfg := cfg.GetKubeletConfig()
By(fmt.Sprintf("Using config (%#v)", kcfg)) By(fmt.Sprintf("Using config (%#v)", kcfg))
podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag))} podSpecOpts := []testpod.SpecOption{testpod.SpecWithContainerImage(dockerImage)}
topologyUpdaterDaemonSet = testds.NFDTopologyUpdater(kcfg, podSpecOpts...) topologyUpdaterDaemonSet = testds.NFDTopologyUpdater(kcfg, podSpecOpts...)
}) })
@ -281,7 +281,7 @@ excludeList:
By(fmt.Sprintf("Using config (%#v)", kcfg)) By(fmt.Sprintf("Using config (%#v)", kcfg))
podSpecOpts := []testpod.SpecOption{ podSpecOpts := []testpod.SpecOption{
testpod.SpecWithContainerImage(fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag)), testpod.SpecWithContainerImage(dockerImage),
testpod.SpecWithConfigMap(cm.Name, "/etc/kubernetes/node-feature-discovery"), testpod.SpecWithConfigMap(cm.Name, "/etc/kubernetes/node-feature-discovery"),
} }
topologyUpdaterDaemonSet = testds.NFDTopologyUpdater(kcfg, podSpecOpts...) topologyUpdaterDaemonSet = testds.NFDTopologyUpdater(kcfg, podSpecOpts...)