Skip to content

Commit c93cb4d

Browse files
fl64fl64
committed
chore(module): generic-vmclass-was-ever-created
1 parent 74e2190 commit c93cb4d

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎images/hooks/pkg/hooks/create-generic-vmclass/hook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ func Reconcile(_ context.Context, input *pkg.HookInput) error {
9292
return nil
9393
}
9494

95-
// if module-state secret exists and contains generic-vmclass-created=true, nothing to do
95+
// if module-state secret exists and contains generic-vmclass-was-ever-created=true, nothing to do
9696
if len(moduleStateSecrets) > 0 {
9797
var moduleStateSecret corev1.Secret
9898
if err := moduleStateSecrets[0].UnmarshalTo(&moduleStateSecret); err != nil {
9999
return err
100100
}
101101

102-
if string(moduleStateSecret.Data["generic-vmclass-created"]) == "true" {
102+
if string(moduleStateSecret.Data["generic-vmclass-was-ever-created"]) == "true" {
103103
return nil
104104
}
105105
}

‎images/hooks/pkg/hooks/create-generic-vmclass/hook_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ var _ = Describe("Create Generic VMClass hook", func() {
6060
patchCollector = nil
6161
})
6262

63-
Context("when module-state secret exists with generic-vmclass-created=true", func() {
63+
Context("when module-state secret exists with generic-vmclass-was-ever-created=true", func() {
6464
BeforeEach(func() {
6565
moduleStateSecret := &corev1.Secret{
6666
ObjectMeta: metav1.ObjectMeta{
6767
Name: "module-state",
6868
Namespace: "d8-virtualization",
6969
},
7070
Data: map[string][]byte{
71-
"generic-vmclass-created": []byte("true"),
71+
"generic-vmclass-was-ever-created": []byte("true"),
7272
},
7373
}
7474

@@ -117,7 +117,7 @@ var _ = Describe("Create Generic VMClass hook", func() {
117117

118118
})
119119

120-
Context("when module-state secret exists but doesn't contain generic-vmclass-created", func() {
120+
Context("when module-state secret exists but doesn't contain generic-vmclass-was-ever-created", func() {
121121
BeforeEach(func() {
122122
moduleStateSecret := &corev1.Secret{
123123
ObjectMeta: metav1.ObjectMeta{
@@ -158,15 +158,15 @@ var _ = Describe("Create Generic VMClass hook", func() {
158158

159159
})
160160

161-
Context("when module-state secret exists with generic-vmclass-created=false", func() {
161+
Context("when module-state secret exists with generic-vmclass-was-ever-created=false", func() {
162162
BeforeEach(func() {
163163
moduleStateSecret := &corev1.Secret{
164164
ObjectMeta: metav1.ObjectMeta{
165165
Name: "module-state",
166166
Namespace: "d8-virtualization",
167167
},
168168
Data: map[string][]byte{
169-
"generic-vmclass-created": []byte("false"),
169+
"generic-vmclass-was-ever-created": []byte("false"),
170170
},
171171
}
172172

‎images/hooks/pkg/hooks/update-module-state/hook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const (
4444
apiVersion = core.GroupName + "/" + v1alpha2.Version
4545

4646
// State fields configuration
47-
genericVMClassStateKey = "generic-vmclass-created"
47+
genericVMClassStateKey = "generic-vmclass-was-ever-created"
4848
)
4949

5050
var _ = registry.RegisterFunc(config, Reconcile)
@@ -125,7 +125,7 @@ func Reconcile(_ context.Context, input *pkg.HookInput) error {
125125
}
126126
}
127127

128-
// Update state: generic-vmclass-created can only transition from false to true
128+
// Update state: generic-vmclass-was-ever-created can only transition from false to true
129129
newState := ModuleState{
130130
GenericVMClassCreated: currentState.GenericVMClassCreated || vmClassExists,
131131
}

‎images/hooks/pkg/hooks/update-module-state/hook_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ var _ = Describe("Update Module State hook", func() {
7777
Expect(ok).To(BeTrue())
7878
Expect(secret.Name).To(Equal("module-state"))
7979
Expect(secret.Namespace).To(Equal(settings.ModuleNamespace))
80-
Expect(secret.Data).To(HaveKey("generic-vmclass-created"))
80+
Expect(secret.Data).To(HaveKey("generic-vmclass-was-ever-created"))
8181

82-
Expect(string(secret.Data["generic-vmclass-created"])).To(Equal("true"))
82+
Expect(string(secret.Data["generic-vmclass-was-ever-created"])).To(Equal("true"))
8383
})
8484

8585
patchCollector.PatchWithMergeMock.Optional()
@@ -96,7 +96,7 @@ var _ = Describe("Update Module State hook", func() {
9696
Namespace: settings.ModuleNamespace,
9797
},
9898
Data: map[string][]byte{
99-
"generic-vmclass-created": []byte("false"),
99+
"generic-vmclass-was-ever-created": []byte("false"),
100100
},
101101
}
102102

@@ -116,9 +116,9 @@ var _ = Describe("Update Module State hook", func() {
116116

117117
data, ok := patchData["data"].(map[string]string)
118118
Expect(ok).To(BeTrue())
119-
Expect(data).To(HaveKey("generic-vmclass-created"))
119+
Expect(data).To(HaveKey("generic-vmclass-was-ever-created"))
120120

121-
Expect(data["generic-vmclass-created"]).To(Equal(base64.StdEncoding.EncodeToString([]byte("true"))))
121+
Expect(data["generic-vmclass-was-ever-created"]).To(Equal(base64.StdEncoding.EncodeToString([]byte("true"))))
122122
})
123123

124124
patchCollector.CreateMock.Optional()
@@ -135,7 +135,7 @@ var _ = Describe("Update Module State hook", func() {
135135
Namespace: settings.ModuleNamespace,
136136
},
137137
Data: map[string][]byte{
138-
"generic-vmclass-created": []byte("true"),
138+
"generic-vmclass-was-ever-created": []byte("true"),
139139
},
140140
}
141141

@@ -155,9 +155,9 @@ var _ = Describe("Update Module State hook", func() {
155155

156156
data, ok := patchData["data"].(map[string]string)
157157
Expect(ok).To(BeTrue())
158-
Expect(data).To(HaveKey("generic-vmclass-created"))
158+
Expect(data).To(HaveKey("generic-vmclass-was-ever-created"))
159159

160-
Expect(data["generic-vmclass-created"]).To(Equal(base64.StdEncoding.EncodeToString([]byte("true"))))
160+
Expect(data["generic-vmclass-was-ever-created"]).To(Equal(base64.StdEncoding.EncodeToString([]byte("true"))))
161161
})
162162

163163
patchCollector.CreateMock.Optional()
@@ -181,9 +181,9 @@ var _ = Describe("Update Module State hook", func() {
181181
Expect(ok).To(BeTrue())
182182
Expect(secret.Name).To(Equal("module-state"))
183183
Expect(secret.Namespace).To(Equal(settings.ModuleNamespace))
184-
Expect(secret.Data).To(HaveKey("generic-vmclass-created"))
184+
Expect(secret.Data).To(HaveKey("generic-vmclass-was-ever-created"))
185185

186-
Expect(string(secret.Data["generic-vmclass-created"])).To(Equal("false"))
186+
Expect(string(secret.Data["generic-vmclass-was-ever-created"])).To(Equal("false"))
187187
})
188188

189189
patchCollector.PatchWithMergeMock.Optional()
@@ -200,7 +200,7 @@ var _ = Describe("Update Module State hook", func() {
200200
Namespace: settings.ModuleNamespace,
201201
},
202202
Data: map[string][]byte{
203-
"generic-vmclass-created": []byte("true"),
203+
"generic-vmclass-was-ever-created": []byte("true"),
204204
},
205205
}
206206

@@ -240,7 +240,7 @@ var _ = Describe("Update Module State hook", func() {
240240
Namespace: settings.ModuleNamespace,
241241
},
242242
Data: map[string][]byte{
243-
"generic-vmclass-created": []byte("false"),
243+
"generic-vmclass-was-ever-created": []byte("false"),
244244
},
245245
}
246246

@@ -260,10 +260,10 @@ var _ = Describe("Update Module State hook", func() {
260260

261261
data, ok := patchData["data"].(map[string]string)
262262
Expect(ok).To(BeTrue())
263-
Expect(data).To(HaveKey("generic-vmclass-created"))
263+
Expect(data).To(HaveKey("generic-vmclass-was-ever-created"))
264264

265265
// Should remain false since VMClass doesn't exist
266-
Expect(data["generic-vmclass-created"]).To(Equal(base64.StdEncoding.EncodeToString([]byte("false"))))
266+
Expect(data["generic-vmclass-was-ever-created"]).To(Equal(base64.StdEncoding.EncodeToString([]byte("false"))))
267267
})
268268

269269
patchCollector.CreateMock.Optional()
@@ -283,7 +283,7 @@ var _ = Describe("Update Module State hook", func() {
283283
Namespace: settings.ModuleNamespace,
284284
},
285285
Data: map[string][]byte{
286-
"generic-vmclass-created": []byte("true"),
286+
"generic-vmclass-was-ever-created": []byte("true"),
287287
},
288288
}
289289

0 commit comments

Comments
 (0)