wip

Author: Tomasz-Smelcerz-SAP

internal/controller/kyma/controller.go

@@ -576,7 +576,7 @@ func (r *Reconciler) updateKyma(ctx context.Context, kyma *v1beta2.Kyma) error {
 
 func (r *Reconciler) reconcileManifests(ctx context.Context, kyma *v1beta2.Kyma) error {
 	templates := r.TemplateLookup.GetRegularTemplates(ctx, kyma)
-	ociRepo := "http://k3d-kcp-registry.localhost:5000/component-descriptors" //TODO: Get from configuration
+	ociRepo := "http://k3d-kcp-registry.localhost:5000" ///component-descriptors" //TODO: Get from configuration
 	prsr := parser.NewParser(r.Client, r.DescriptorProvider, r.RemoteSyncNamespace, ociRepo)
 	modules := prsr.GenerateModulesFromTemplates(kyma, templates)
 

internal/controller/mandatorymodule/installation_controller.go

@@ -85,7 +85,7 @@ func (r *InstallationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 func (r *InstallationReconciler) GenerateModulesFromTemplate(ctx context.Context,
 	templates templatelookup.ModuleTemplatesByModuleName, kyma *v1beta2.Kyma,
 ) (modulecommon.Modules, error) {
-	ociRepo := "http://k3d-kcp-registry.localhost:5000/component-descriptors" //TODO: Get from configuration
+	ociRepo := "http://k3d-kcp-registry.localhost:5000" ///component-descriptors" //TODO: Get from configuration
 	parser := parser.NewParser(r.Client, r.DescriptorProvider, r.RemoteSyncNamespace, ociRepo)
 	return parser.GenerateMandatoryModulesFromTemplates(ctx, kyma, templates), nil
 }

internal/manifest/img/pathextractor.go

@@ -61,7 +61,8 @@ func (p PathExtractor) GetPathForFetchedLayer(ctx context.Context,
 	keyChain authn.Keychain,
 	filename string,
 ) (string, error) {
-	imageRef := fmt.Sprintf("%s/%s@%s", imageSpec.Repo, imageSpec.Name, imageSpec.Ref)
+	//TODO: use component-descriptors from constants
+	imageRef := fmt.Sprintf("%s/%s/%s@%s", imageSpec.Repo, "component-descriptors", imageSpec.Name, imageSpec.Ref)
 
 	installPath := getFsChartPath(imageSpec)
 	manifestPath := path.Join(installPath, filename)