Skip to content
This repository was archived by the owner on Oct 22, 2021. It is now read-only.

Commit e3c5b3a

Browse files
mannomanno
committed
Merge branch 'master' into v7.x
2 parents affa4a5 + 1257be8 commit e3c5b3a

File tree

13 files changed

+200
-129
lines changed

13 files changed

+200
-129
lines changed

‎integration/bdpl_update_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ var _ = Describe("BDPL updates", func() {
176176
Expect(err).NotTo(HaveOccurred(), "error retrieving clusterIP service")
177177

178178
tearDown, err := env.CreateService(env.Namespace, env.NodePortService("nats-service", "nats", svc.Spec.Ports[0].Port))
179-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
179+
tearDowns = append(tearDowns, tearDown)
180180
Expect(err).NotTo(HaveOccurred(), "error creating service")
181181

182182
service, err := env.GetService(env.Namespace, "nats-service")
@@ -554,11 +554,11 @@ var _ = Describe("BDPL updates", func() {
554554
manifestName := "bosh-manifest-two-instance-groups"
555555
tearDown, err := env.CreateConfigMap(env.Namespace, env.BOSHManifestConfigMap("fooconfigmap", bm.BOSHManifestWithTwoInstanceGroups))
556556
Expect(err).NotTo(HaveOccurred())
557-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
557+
tearDowns = append(tearDowns, tearDown)
558558

559559
_, tearDown, err = env.CreateBOSHDeployment(env.Namespace, env.DefaultBOSHDeployment(manifestName, "fooconfigmap"))
560560
Expect(err).NotTo(HaveOccurred())
561-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
561+
tearDowns = append(tearDowns, tearDown)
562562

563563
By("checking for nats instance group pods")
564564
err = env.WaitForInstanceGroup(env.Namespace, manifestName, "nats", 2)

‎integration/drain_test.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,26 @@ import (
1212
var _ = Describe("Drain", func() {
1313
var (
1414
boshDeployment bdv1.BOSHDeployment
15+
tearDowns []machine.TearDownFunc
1516
)
1617
BeforeEach(func() {
1718
boshDeployment = env.DefaultBOSHDeployment("test", "manifest")
1819
})
1920

21+
AfterEach(func() {
22+
Expect(env.TearDownAll(tearDowns)).To(Succeed())
23+
})
24+
2025
When("deleting the deployment", func() {
2126
It("executes the job's drain scripts", func() {
2227
cm := env.BOSHManifestConfigMap("manifest", bm.Drains)
2328
tearDown, err := env.CreateConfigMap(env.Namespace, cm)
2429
Expect(err).NotTo(HaveOccurred())
25-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
30+
tearDowns = append(tearDowns, tearDown)
2631

2732
_, tearDown, err = env.CreateBOSHDeployment(env.Namespace, boshDeployment)
2833
Expect(err).NotTo(HaveOccurred())
29-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
34+
tearDowns = append(tearDowns, tearDown)
3035

3136
By("checking for instance group pods")
3237
err = env.WaitForInstanceGroup(env.Namespace, "test", "drains", 1)

‎integration/storage/deploy_with_storage_test.go‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ import (
1414
)
1515

1616
var _ = Describe("DeployWithStorage", func() {
17+
var tearDowns []machine.TearDownFunc
18+
19+
AfterEach(func() {
20+
Expect(env.TearDownAll(tearDowns)).To(Succeed())
21+
})
22+
1723
Context("when using multiple processes in BPM", func() {
1824
It("should add multiple containers to a pod", func() {
1925
By("Creating a secret for implicit variable")
@@ -22,18 +28,18 @@ var _ = Describe("DeployWithStorage", func() {
2228

2329
tearDown, err := env.CreateSecret(env.Namespace, env.StorageClassSecret("var-operator-test-storage-class", storageClass))
2430
Expect(err).NotTo(HaveOccurred())
25-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
31+
tearDowns = append(tearDowns, tearDown)
2632

2733
tearDown, err = env.CreateConfigMap(env.Namespace, corev1.ConfigMap{
2834
ObjectMeta: metav1.ObjectMeta{Name: "bpm-manifest"},
2935
Data: map[string]string{"manifest": bm.BPMRelease},
3036
})
3137
Expect(err).NotTo(HaveOccurred())
32-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
38+
tearDowns = append(tearDowns, tearDown)
3339

3440
_, tearDown, err = env.CreateBOSHDeployment(env.Namespace, env.DefaultBOSHDeployment("test-bdpl", "bpm-manifest"))
3541
Expect(err).NotTo(HaveOccurred())
36-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
42+
tearDowns = append(tearDowns, tearDown)
3743

3844
By("checking for instance group pods")
3945
err = env.WaitForInstanceGroup(env.Namespace, "test-bdpl", "bpm", 1)
@@ -77,15 +83,15 @@ var _ = Describe("DeployWithStorage", func() {
7783

7884
tearDown, err := env.CreateSecret(env.Namespace, env.StorageClassSecret("var-operator-test-storage-class", storageClass))
7985
Expect(err).NotTo(HaveOccurred())
80-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
86+
tearDowns = append(tearDowns, tearDown)
8187

8288
tearDown, err = env.CreateConfigMap(env.Namespace, env.BOSHManifestConfigMap("bpm-affinity", bm.BPMReleaseWithAffinity))
8389
Expect(err).NotTo(HaveOccurred(), "error creating configMap")
84-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
90+
tearDowns = append(tearDowns, tearDown)
8591

8692
_, tearDown, err = env.CreateBOSHDeployment(env.Namespace, env.DefaultBOSHDeployment("bpm-affinity", "bpm-affinity"))
8793
Expect(err).NotTo(HaveOccurred())
88-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
94+
tearDowns = append(tearDowns, tearDown)
8995

9096
By("checking for pod")
9197
err = env.WaitForInstanceGroup(env.Namespace, "bpm-affinity", "bpm1", 2)

‎integration/util/tlogs_test.go‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ import (
1313
)
1414

1515
var _ = Describe("when testing tail-logs subcommand", func() {
16+
var tearDowns []machine.TearDownFunc
17+
18+
AfterEach(func() {
19+
Expect(env.TearDownAll(tearDowns)).To(Succeed())
20+
})
21+
1622
Context("subcommand must be working", func() {
1723
podName := "test-pod-bar-foo"
1824
parentCName := "fake-nats"
@@ -29,7 +35,7 @@ var _ = Describe("when testing tail-logs subcommand", func() {
2935

3036
tearDown, err := env.CreatePod(env.Namespace, testPod)
3137
Expect(err).NotTo(HaveOccurred())
32-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
38+
tearDowns = append(tearDowns, tearDown)
3339

3440
err = env.WaitForPod(env.Namespace, podName)
3541
Expect(err).NotTo(HaveOccurred())
@@ -55,7 +61,7 @@ var _ = Describe("when testing tail-logs subcommand", func() {
5561

5662
tearDown, err := env.CreatePod(env.Namespace, testPod)
5763
Expect(err).NotTo(HaveOccurred())
58-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
64+
tearDowns = append(tearDowns, tearDown)
5965

6066
err = env.WaitForPod(env.Namespace, podName)
6167
Expect(err).NotTo(HaveOccurred())
@@ -80,7 +86,7 @@ var _ = Describe("when testing tail-logs subcommand", func() {
8086

8187
tearDown, err := env.CreatePod(env.Namespace, testPod)
8288
Expect(err).NotTo(HaveOccurred())
83-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
89+
tearDowns = append(tearDowns, tearDown)
8490

8591
err = env.WaitForPod(env.Namespace, podName)
8692
Expect(err).NotTo(HaveOccurred())
@@ -100,7 +106,7 @@ var _ = Describe("when testing tail-logs subcommand", func() {
100106

101107
tearDown, err := env.CreatePod(env.Namespace, testPod)
102108
Expect(err).NotTo(HaveOccurred())
103-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
109+
tearDowns = append(tearDowns, tearDown)
104110

105111
err = env.WaitForPod(env.Namespace, podName)
106112
Expect(err).NotTo(HaveOccurred())
@@ -120,7 +126,7 @@ var _ = Describe("when testing tail-logs subcommand", func() {
120126

121127
tearDown, err := env.CreatePod(env.Namespace, testPod)
122128
Expect(err).NotTo(HaveOccurred())
123-
defer func(tdf machine.TearDownFunc) { Expect(tdf()).To(Succeed()) }(tearDown)
129+
tearDowns = append(tearDowns, tearDown)
124130

125131
err = env.WaitForPod(env.Namespace, podName)
126132
Expect(err).NotTo(HaveOccurred())
@@ -131,7 +137,6 @@ var _ = Describe("when testing tail-logs subcommand", func() {
131137
time.Sleep(1 * time.Minute)
132138
err = env.WaitForPodContainerLogMsg(env.Namespace, podName, sidecarCName, "running logrotate")
133139
Expect(err).NotTo(HaveOccurred())
134-
135140
})
136141
})
137142
})

‎pkg/bosh/bpmconverter/container_factory.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,18 @@ const (
4646
// ContainerFactoryImpl is a concrete implementation of ContainerFactor.
4747
type ContainerFactoryImpl struct {
4848
instanceGroupName string
49+
errand bool
4950
version string
5051
disableLogSidecar bool
5152
releaseImageProvider bdm.ReleaseImageProvider
5253
bpmConfigs bpm.Configs
5354
}
5455

5556
// NewContainerFactory returns a concrete implementation of ContainerFactory.
56-
func NewContainerFactory(instanceGroupName string, version string, disableLogSidecar bool, releaseImageProvider bdm.ReleaseImageProvider, bpmConfigs bpm.Configs) *ContainerFactoryImpl {
57+
func NewContainerFactory(igName string, errand bool, version string, disableLogSidecar bool, releaseImageProvider bdm.ReleaseImageProvider, bpmConfigs bpm.Configs) ContainerFactory {
5758
return &ContainerFactoryImpl{
58-
instanceGroupName: instanceGroupName,
59+
instanceGroupName: igName,
60+
errand: errand,
5961
version: version,
6062
disableLogSidecar: disableLogSidecar,
6163
releaseImageProvider: releaseImageProvider,

‎pkg/bosh/bpmconverter/container_factory_test.go‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
var _ = Describe("ContainerFactory", func() {
2222
var (
23-
containerFactory *ContainerFactoryImpl
23+
containerFactory ContainerFactory
2424
bpmConfigs bpm.Configs
2525
releaseImageProvider *fakes.FakeReleaseImageProvider
2626
jobs []bdm.Job
@@ -165,7 +165,7 @@ var _ = Describe("ContainerFactory", func() {
165165
})
166166

167167
JustBeforeEach(func() {
168-
containerFactory = NewContainerFactory("fake-ig", "v1", false, releaseImageProvider, bpmConfigs)
168+
containerFactory = NewContainerFactory("fake-ig", false, "v1", false, releaseImageProvider, bpmConfigs)
169169
})
170170

171171
Context("JobsToContainers", func() {
@@ -320,7 +320,7 @@ var _ = Describe("ContainerFactory", func() {
320320
},
321321
},
322322
}
323-
containerFactory = NewContainerFactory("fake-ig", "v1", false, releaseImageProvider, bpmConfigsWithError)
323+
containerFactory = NewContainerFactory("fake-ig", false, "v1", false, releaseImageProvider, bpmConfigsWithError)
324324
actWithError := func() ([]corev1.Container, error) {
325325
return containerFactory.JobsToContainers(jobs, []corev1.VolumeMount{}, bdm.Disks{})
326326
}
@@ -368,13 +368,6 @@ var _ = Describe("ContainerFactory", func() {
368368
Expect(containers[1].Env).To(HaveLen(5))
369369
})
370370

371-
It("handles an error when jobs is empty", func() {
372-
jobs = []bdm.Job{}
373-
_, err := act()
374-
Expect(err).To(HaveOccurred())
375-
Expect(err.Error()).To(ContainSubstring("instance group 'fake-ig' has no jobs defined"))
376-
})
377-
378371
It("handles an error when getting release image fails", func() {
379372
releaseImageProvider.GetReleaseImageReturns("", errors.New("fake-release-image-error"))
380373
_, err := act()
@@ -552,7 +545,7 @@ var _ = Describe("ContainerFactory", func() {
552545

553546
disableSideCar := ig.Env.AgentEnvBoshConfig.Agent.Settings.DisableLogSidecar
554547

555-
containerFactory := NewContainerFactory(ig.Name, "v1", disableSideCar, releaseImageProvider, bpmJobConfigs)
548+
containerFactory := NewContainerFactory(ig.Name, false, "v1", disableSideCar, releaseImageProvider, bpmJobConfigs)
556549
act := func() ([]corev1.Container, error) {
557550
return containerFactory.JobsToContainers(ig.Jobs, []corev1.VolumeMount{}, bdm.Disks{})
558551
}
@@ -579,7 +572,7 @@ var _ = Describe("ContainerFactory", func() {
579572

580573
disableSideCar := ig.Env.AgentEnvBoshConfig.Agent.Settings.DisableLogSidecar
581574

582-
containerFactory := NewContainerFactory(ig.Name, "v1", disableSideCar, releaseImageProvider, bpmJobConfigs)
575+
containerFactory := NewContainerFactory(ig.Name, false, "v1", disableSideCar, releaseImageProvider, bpmJobConfigs)
583576
act := func() ([]corev1.Container, error) {
584577
return containerFactory.JobsToContainers(ig.Jobs, []corev1.VolumeMount{}, bdm.Disks{})
585578
}

0 commit comments

Comments
 (0)