Skip to content

Commit 0bbc7c7

Browse files
committed
image_generator: add function getImageConfigMapName
Signed-off-by: Camilla Conte <[email protected]>
1 parent 6646421 commit 0bbc7c7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

controllers/image_generator.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,10 @@ func checkKeysPresentAndNotEmpty(data interface{}, keys []string) bool {
631631
return true
632632
}
633633

634+
func (r *ImageGenerator) getImageConfigMapName() string {
635+
return r.provider + "-podvm-image-cm"
636+
}
637+
634638
// Function to create ConfigMap from a YAML file based on cloud provider
635639
// azure-podvm-image-cm.yaml for Azure
636640
// aws-podvm-image-cm.yaml for AWS
@@ -645,14 +649,14 @@ func (r *ImageGenerator) createImageConfigMapFromFile() error {
645649
// If it doesn't exist, create the ConfigMap
646650

647651
if err := r.client.Get(context.TODO(), types.NamespacedName{
648-
Name: r.provider + "-podvm-image-cm",
652+
Name: r.getImageConfigMapName(),
649653
Namespace: OperatorNamespace,
650654
}, &corev1.ConfigMap{}); err == nil {
651655
igLogger.Info("ConfigMap already exists", "name", r.provider+"-podvm-image-cm")
652656
return nil
653657
}
654658

655-
filename := r.provider + "-podvm-image-cm.yaml"
659+
filename := r.getImageConfigMapName() + ".yaml"
656660
configMapYamlFile := filepath.Join(peerpodsImageJobsPathLocation, filename)
657661
yamlData, err := readYamlFile(configMapYamlFile)
658662
if err != nil {
@@ -693,7 +697,7 @@ func (r *ImageGenerator) updateImageConfigMap() error {
693697
// If it doesn't exist, return an error
694698
// If it exists, update the ConfigMap
695699

696-
cmName := r.provider + "-podvm-image-cm"
700+
cmName := r.getImageConfigMapName()
697701
cm := &corev1.ConfigMap{}
698702
if err := r.client.Get(context.TODO(), types.NamespacedName{
699703
Name: cmName,

0 commit comments

Comments
 (0)