Skip to content

Commit 922808f

Browse files
Populate ConfigMap kind
Signed-off-by: Danil-Grigorev <[email protected]>
1 parent 74196f4 commit 922808f

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

internal/controller/manifests_downloader.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ import (
2121
"compress/gzip"
2222
"context"
2323
"fmt"
24+
"strings"
2425

2526
corev1 "k8s.io/api/core/v1"
2627
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2728
"k8s.io/apimachinery/pkg/labels"
29+
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
2830

2931
"sigs.k8s.io/cluster-api/cmd/clusterctl/client/repository"
3032
ctrl "sigs.k8s.io/controller-runtime"
@@ -164,7 +166,16 @@ func (p *phaseReconciler) prepareConfigMapLabels() map[string]string {
164166
func TemplateManifestsConfigMap(provider operatorv1.GenericProvider, labels map[string]string, metadata, components []byte, compress bool) (*corev1.ConfigMap, error) {
165167
configMapName := fmt.Sprintf("%s-%s-%s", provider.GetType(), provider.GetName(), provider.GetSpec().Version)
166168

169+
kinds, _, err := clientgoscheme.Scheme.ObjectKinds(&corev1.ConfigMap{})
170+
if err != nil || len(kinds) == 0 {
171+
return nil, fmt.Errorf("cannot fetch kind of the ConfigMap resource: %w", err)
172+
}
173+
167174
configMap := &corev1.ConfigMap{
175+
TypeMeta: metav1.TypeMeta{
176+
Kind: kinds[0].Kind,
177+
APIVersion: kinds[0].GroupVersion().String(),
178+
},
168179
ObjectMeta: metav1.ObjectMeta{
169180
Name: configMapName,
170181
Namespace: provider.GetNamespace(),
@@ -297,7 +308,7 @@ func ProviderLabels(provider operatorv1.GenericProvider) map[string]string {
297308
}
298309

299310
if provider.GetSpec().FetchConfig != nil && provider.GetSpec().FetchConfig.OCI != "" {
300-
labels[configMapSourceLabel] = provider.GetSpec().FetchConfig.OCI
311+
labels[configMapSourceLabel] = strings.ReplaceAll(provider.GetSpec().FetchConfig.OCI, "/", "_")
301312
}
302313

303314
return labels

0 commit comments

Comments
 (0)