local blob deployer (gardener#921)

* replace ocm dependency with ocm master * implement getResourceKeyGoFunc * add resourceKey to helm deployItem api * implement getChartFromResourceRef scaffold * update go mod file (run-int-tests) * update go and golangci version * resolve deprecation warnings * adjust validation to enable using new chart configuration (run-int-tests) * implement getChartFromResourceRef * implement template function to return resource content (run-int-tests) * implement spiff functions and tests (run-int-tests) * enable cd:// path expressions for resource reference (run-int-tests) * implement path expression for spiff and tests * (run-int-tests) * fix linter warnings (run-int-tests) * convert resourceRef to string (run-int-tests) * GetChart from resourceRef test * upgrade ocm dependency (run-int-tests)
enrico-kaack-comp · Jan 24, 2024 · 8ac4ffc · 8ac4ffc
1 parent e2e40a0
commit 8ac4ffc
Show file tree

Hide file tree

Showing 3,280 changed files with 377,902 additions and 49,275 deletions.
diff --git a/apis/.schemes/helm-v1alpha1-ProviderConfiguration.json b/apis/.schemes/helm-v1alpha1-ProviderConfiguration.json
@@ -484,6 +484,10 @@
         "ref": {
           "description": "Ref defines the reference to a helm chart in a oci repository.",
           "type": "string"
+        },
+        "resourceRef": {
+          "description": "ResourceKey defines a key that can be given to a corresponding API in order to fetch the content of the resource defined in the blueprint",
+          "type": "string"
         }
       }
     },

diff --git a/apis/deployer/helm/types_provider.go b/apis/deployer/helm/types_provider.go
@@ -111,6 +111,10 @@ type Chart struct {
 	// HelmChartRepo defines a reference to a chart in a helm chart repo.
 	// +optional
 	HelmChartRepo *HelmChartRepo `json:"helmChartRepo,omitempty"`
+	// ResourceKey defines a key that can be given to a corresponding API in order to fetch the content of the resource
+	// defined in the blueprint
+	// +optional
+	ResourceRef string `json:"resourceRef,omitempty"`
 }
 
 // HelmChartRepo defines a reference to a chart in a helm chart repo

diff --git a/apis/deployer/helm/v1alpha1/types_provider.go b/apis/deployer/helm/v1alpha1/types_provider.go
@@ -109,6 +109,14 @@ type Chart struct {
 	// HelmChartRepo defines a reference to a chart in a helm chart repo.
 	// +optional
 	HelmChartRepo *HelmChartRepo `json:"helmChartRepo,omitempty"`
+	// ResourceKey defines a key that can be given to a corresponding API in order to fetch the content of the resource
+	// defined in the blueprint
+	// +optional
+	ResourceRef string `json:"resourceRef,omitempty"`
+}
+
+type ResourceRef struct {
+	Key string `json:"key,omitempty"`
 }
 
 // HelmChartRepo defines a reference to a chart in a helm chart repo

diff --git a/apis/deployer/helm/v1alpha1/validation/validation.go b/apis/deployer/helm/v1alpha1/validation/validation.go
@@ -78,8 +78,8 @@ func ValidateProviderConfiguration(config *helmv1alpha1.ProviderConfiguration) e
 // ValidateChart validates the access methods for a chart
 func ValidateChart(fldPath *field.Path, chart helmv1alpha1.Chart) field.ErrorList {
 	allErrs := field.ErrorList{}
-	if len(chart.Ref) == 0 && chart.Archive == nil && chart.FromResource == nil && chart.HelmChartRepo == nil {
-		subPath := fldPath.Child("ref", "archive", "fromResource", "helmChartRepo")
+	if len(chart.Ref) == 0 && chart.Archive == nil && chart.FromResource == nil && chart.HelmChartRepo == nil && chart.ResourceRef == "" {
+		subPath := fldPath.Child("ref", "archive", "fromResource", "helmChartRepo", "resourceRef")
 		err := field.Required(subPath, "must not be empty")
 		return append(allErrs, err)
 	}

diff --git a/apis/deployer/helm/v1alpha1/zz_generated.conversion.go b/apis/deployer/helm/v1alpha1/zz_generated.conversion.go
diff --git a/apis/deployer/helm/v1alpha1/zz_generated.deepcopy.go b/apis/deployer/helm/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/openapi/openapi_generated.go b/apis/openapi/openapi_generated.go
diff --git a/cmd/landscaper-agent/app/options.go b/cmd/landscaper-agent/app/options.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"
 
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -71,7 +71,7 @@ func (o *options) Complete() error {
 		LeaderElection:     false,
 		Port:               9443,
 		MetricsBindAddress: "0",
-		SyncPeriod:         pointer.Duration(time.Hour * 24 * 1000),
+		SyncPeriod:         ptr.To[time.Duration](time.Hour * 24 * 1000),
 	}
 
 	hostRestConfig, err := ctrl.GetConfig()

diff --git a/cmd/landscaper-controller/app/app.go b/cmd/landscaper-controller/app/app.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"time"
 
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/mandelsoft/vfs/pkg/osfs"
 	"github.com/spf13/cobra"
@@ -88,7 +88,7 @@ func (o *Options) run(ctx context.Context) error {
 		LeaderElection:     false,
 		Port:               9443,
 		MetricsBindAddress: "0",
-		SyncPeriod:         pointer.Duration(time.Hour * 24 * 1000),
+		SyncPeriod:         ptr.To[time.Duration](time.Hour * 24 * 1000),
 	}
 
 	//TODO: investigate whether this is used with an uncached client

diff --git a/cmd/target-sync-controller/app/app.go b/cmd/target-sync-controller/app/app.go
@@ -8,21 +8,28 @@ import (
 	"context"
 	"fmt"
 	"os"
+
+	"k8s.io/utils/ptr"
+
+	"github.com/gardener/landscaper/controller-utils/pkg/logging"
+
+	"k8s.io/client-go/tools/clientcmd"
+
+	lc "github.com/gardener/landscaper/controller-utils/pkg/logging/constants"
+
+	lsutils "github.com/gardener/landscaper/pkg/utils"
+
 	"time"
 
+	"github.com/gardener/landscaper/pkg/landscaper/controllers/targetsync"
+
 	"github.com/spf13/cobra"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	lsconfig "github.com/gardener/landscaper/apis/config"
 	lsinstall "github.com/gardener/landscaper/apis/core/install"
-	"github.com/gardener/landscaper/controller-utils/pkg/logging"
-	lc "github.com/gardener/landscaper/controller-utils/pkg/logging/constants"
-	"github.com/gardener/landscaper/pkg/landscaper/controllers/targetsync"
 	"github.com/gardener/landscaper/pkg/landscaper/crdmanager"
-	lsutils "github.com/gardener/landscaper/pkg/utils"
 	"github.com/gardener/landscaper/pkg/version"
 )
 
@@ -57,7 +64,7 @@ func (o *options) run(ctx context.Context) error {
 		LeaderElection:     false,
 		Port:               9443,
 		MetricsBindAddress: "0",
-		SyncPeriod:         pointer.Duration(time.Hour * 24 * 1000),
+		SyncPeriod:         ptr.To[time.Duration](time.Hour * 24 * 1000),
 	}
 
 	data, err := os.ReadFile(o.landscaperKubeconfigPath)
@@ -105,8 +112,8 @@ func (o *options) run(ctx context.Context) error {
 func (o *options) ensureCRDs(ctx context.Context, mgr manager.Manager) error {
 	ctx = logging.NewContext(ctx, logging.Wrap(ctrl.Log.WithName("crdManager")))
 	crdConfig := lsconfig.CrdManagementConfiguration{
-		DeployCustomResourceDefinitions: pointer.Bool(true),
-		ForceUpdate:                     pointer.Bool(true),
+		DeployCustomResourceDefinitions: ptr.To[bool](true),
+		ForceUpdate:                     ptr.To[bool](true),
 	}
 
 	lsConfig := lsconfig.LandscaperConfiguration{

diff --git a/docs/api-reference/core.md b/docs/api-reference/core.md
@@ -99,7 +99,7 @@ e.g. &ldquo;<a href="https://json-schema.org/draft/2019-09/schema&quot;">https:/
 <code>localTypes</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.JSONSchemaDefinition">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.JSONSchemaDefinition
+map[string]..JSONSchemaDefinition
 </a>
 </em>
 </td>
@@ -1012,7 +1012,7 @@ InstallationImports
 <code>importDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -1043,7 +1043,7 @@ InstallationExports
 <code>exportDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -1180,7 +1180,7 @@ InstallationImports
 <code>importDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -1211,7 +1211,7 @@ InstallationExports
 <code>exportDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -2522,7 +2522,7 @@ Note that the type information is used to determine the secret key and the type
 <code>configurations</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -2978,8 +2978,8 @@ Error
 <td>
 <code>lastErrors</code></br>
 <em>
-<a href="#landscaper.gardener.cloud/v1alpha1.*github.com/gardener/landscaper/apis/core/v1alpha1.Error">
-[]*github.com/gardener/landscaper/apis/core/v1alpha1.Error
+<a href="#landscaper.gardener.cloud/v1alpha1.*..Error">
+[]*..Error
 </a>
 </em>
 </td>
@@ -3375,7 +3375,7 @@ InstallationImports
 <code>importDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -4600,7 +4600,7 @@ InstallationImports
 <code>importDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>
@@ -4631,7 +4631,7 @@ InstallationExports
 <code>exportDataMappings</code></br>
 <em>
 <a href="#landscaper.gardener.cloud/v1alpha1.AnyJSON">
-map[string]github.com/gardener/landscaper/apis/core/v1alpha1.AnyJSON
+map[string]..AnyJSON
 </a>
 </em>
 </td>