Skip to content

Commit

Permalink
Update landscaper to version v0.52.0 (#174)
Browse files Browse the repository at this point in the history 
* Update landscaper to version v0.52.0

* Add missing file

* Generate
  • Loading branch information
@robertgraeff
robertgraeff authored Mar 22, 2023
1 parent 868c8ec commit 9f7fce4
Show file tree
Hide file tree
Showing 1,307 changed files with 111,247 additions and 29,504 deletions.
8 changes: 4 additions & 4 deletions cmd/blueprints/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type RenderOptions struct {

OCIOptions ociclientopts.Options

outputResources sets.String
outputResources sets.Set[string]
blueprint *lsv1alpha1.Blueprint
blueprintFs vfs.FileSystem
componentDescriptor *cdv2.ComponentDescriptor
Expand Down Expand Up @@ -207,7 +207,7 @@ func (c SimulatorCallbacks) OnExports(installationPath string, exports map[strin
}

func (o *RenderOptions) Run(ctx context.Context, log logr.Logger, fs vfs.FileSystem) error {
log.V(3).Info(fmt.Sprintf("rendering %s", strings.Join(o.outputResources.List(), ", ")))
log.V(3).Info(fmt.Sprintf("rendering %s", strings.Join(sets.List(o.outputResources), ", ")))

overlayFs := layerfs.New(memoryfs.New(), fs)
if err := overlayFs.MkdirAll("/apptmp", os.ModePerm); err != nil {
Expand Down Expand Up @@ -521,14 +521,14 @@ func (o *RenderOptions) Validate() error {
}

func (o *RenderOptions) parseOutputResources(args []string) error {
allResources := sets.NewString(OutputResourceDeployItems, OutputResourceSubinstallations, OutputResourceImports, OutputResourceExports)
allResources := sets.New(OutputResourceDeployItems, OutputResourceSubinstallations, OutputResourceImports, OutputResourceExports)
if len(args) == 1 {
o.outputResources = allResources
return nil
}
if len(args) > 1 {
resources := strings.Split(args[1], ",")
o.outputResources = sets.NewString()
o.outputResources = sets.New[string]()
for _, res := range resources {
if OutputResourceAllTerms.Has(res) {
o.outputResources = allResources
Expand Down
2 changes: 1 addition & 1 deletion cmd/completion/completion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PowerShell:
`,
DisableFlagsInUseLine: true,
ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
Args: cobra.ExactValidArgs(1),
Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
Run: func(cmd *cobra.Command, args []string) {
switch args[0] {
case "bash":
Expand Down
20 changes: 10 additions & 10 deletions cmd/installations/inspect/transformer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,20 +225,20 @@ func (t Transformer) transformDeployItem(deployItem *DeployItemLeaf) (*Printable

func formatStatus(status string) string {
switch status {
case string(lsv1alpha1.InstallationPhaseSucceeded):
case string(lsv1alpha1.InstallationPhases.Succeeded):
return "✅ " + status

case string(lsv1alpha1.InstallationPhaseInit),
string(lsv1alpha1.InstallationPhaseObjectsCreated),
string(lsv1alpha1.InstallationPhaseProgressing),
string(lsv1alpha1.InstallationPhaseCompleting),
string(lsv1alpha1.InstallationPhaseInitDelete),
string(lsv1alpha1.InstallationPhaseTriggerDelete),
string(lsv1alpha1.InstallationPhaseDeleting):
case string(lsv1alpha1.InstallationPhases.Init),
string(lsv1alpha1.InstallationPhases.ObjectsCreated),
string(lsv1alpha1.InstallationPhases.Progressing),
string(lsv1alpha1.InstallationPhases.Completing),
string(lsv1alpha1.InstallationPhases.InitDelete),
string(lsv1alpha1.InstallationPhases.TriggerDelete),
string(lsv1alpha1.InstallationPhases.Deleting):
return "🏗️ " + status

case string(lsv1alpha1.InstallationPhaseFailed),
string(lsv1alpha1.InstallationPhaseDeleteFailed):
case string(lsv1alpha1.InstallationPhases.Failed),
string(lsv1alpha1.InstallationPhases.DeleteFailed):
return "❌ " + status

default:
Expand Down
6 changes: 3 additions & 3 deletions cmd/installations/inspect/tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (i *InstallationTree) filterForFailedInstallation() *InstallationTree {
i.Execution = i.Execution.filterForFailedExecution()
}

if len(filteredSubInstallations) > 0 || i.Execution != nil || i.Installation.Status.InstallationPhase == v1alpha1.InstallationPhaseFailed {
if len(filteredSubInstallations) > 0 || i.Execution != nil || i.Installation.Status.InstallationPhase == v1alpha1.InstallationPhases.Failed {
return i
}
return nil
Expand All @@ -48,7 +48,7 @@ func (e *ExecutionTree) filterForFailedExecution() *ExecutionTree {

e.DeployItems = filteredDeployItems

if len(filteredDeployItems) > 0 || e.Execution.Status.ExecutionPhase == v1alpha1.ExecPhaseFailed {
if len(filteredDeployItems) > 0 || e.Execution.Status.ExecutionPhase == v1alpha1.ExecutionPhases.Failed {
return e
}
return nil
Expand All @@ -60,7 +60,7 @@ type DeployItemLeaf struct {
}

func (d *DeployItemLeaf) filterForFailedDeployItem() *DeployItemLeaf {
if d.DeployItem.Status.Phase == v1alpha1.ExecutionPhaseFailed {
if d.DeployItem.Status.Phase.IsFailed() {
return d
}
return nil
Expand Down
7 changes: 1 addition & 6 deletions docs/reference/landscaper-cli_component-cli.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,13 @@ commands of the components cli

### Options

```
-h, --help help for component-cli
```

### Options inherited from parent commands

```
--cli logger runs as cli logger. enables cli logging
--dev enable development logging which result in console encoding, enabled stacktrace and enabled caller
--disable-caller disable the caller of logs (default true)
--disable-stacktrace disable the stacktrace of error logs (default true)
--disable-timestamp disable timestamp output (default true)
-h, --help help for component-cli
-v, --verbosity int number for the log level verbosity (default 1)
```

Expand Down
108 changes: 54 additions & 54 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,73 @@ module github.com/gardener/landscapercli
go 1.19

require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/Masterminds/semver/v3 v3.2.0
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/gardener/component-cli v0.44.0
github.com/gardener/component-spec/bindings-go v0.0.66
github.com/gardener/landscaper v0.40.0
github.com/gardener/landscaper/apis v0.40.0
github.com/gardener/landscaper/controller-utils v0.40.0
github.com/gardener/landscaper v0.52.0
github.com/gardener/landscaper/apis v0.52.0
github.com/gardener/landscaper/controller-utils v0.52.0
github.com/go-logr/logr v1.2.3
github.com/go-logr/zapr v1.2.3
github.com/golang/mock v1.6.0
github.com/mandelsoft/vfs v0.0.0-20210530103237-5249dc39ce91
github.com/onsi/ginkgo v1.16.5
github.com/spf13/cobra v1.4.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.2
go.uber.org/zap v1.19.1
github.com/stretchr/testify v1.8.1
go.uber.org/zap v1.24.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.24.3
k8s.io/apimachinery v0.24.3
k8s.io/client-go v0.24.3
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/controller-runtime v0.12.2
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.14.0
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/containerd/containerd v1.6.6 // indirect
github.com/containerd/containerd v1.6.18 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
github.com/docker/cli v20.10.21+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker v20.10.17+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/docker/docker v20.10.21+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/drone/envsubst v1.0.2 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gardener/image-vector v0.10.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-containerregistry v0.10.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.4 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mandelsoft/filepath v0.0.0-20200909114706-3df73d378d55 // indirect
github.com/mandelsoft/spiff v1.6.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -79,47 +80,46 @@ require (
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/distribution-spec v1.0.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220524220425-1d687d428aca // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.4.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 // indirect
google.golang.org/grpc v1.45.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.24.3 // indirect
k8s.io/component-base v0.24.3 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/apiextensions-apiserver v0.26.1 // indirect
k8s.io/component-base v0.26.1 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20230217203603-ff9a8e8fa21d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading

0 comments on commit 9f7fce4

Please sign in to comment.