Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update vmware-tanzu/carvel-vendir to carvel.dev/vendir #7515

Merged
merged 3 commits into from
Feb 23, 2024
Merged

Update vmware-tanzu/carvel-vendir to carvel.dev/vendir #7515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c0272b
Update `vmware-tanzu/carvel-vendir` to `carvel.dev/vendir`
antgamdia Feb 23, 2024
b361936
Add aux function to convert to new carvel vendir version
antgamdia Feb 23, 2024
3b72a87
Fix aux function
antgamdia Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021-2023 the Kubeapps contributors.
// Copyright 2021-2024 the Kubeapps contributors.
// SPDX-License-Identifier: Apache-2.0

package main
Expand All @@ -9,12 +9,12 @@ import (
"strings"
"time"

"carvel.dev/vendir/pkg/vendir/versions"
vendirversions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
"github.com/bufbuild/connect-go"
packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
datapackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
kappctrlpackageinstall "github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
vendirversions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1"
"github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/connecterror"
"github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/k8sutils"
Expand Down Expand Up @@ -724,7 +724,7 @@ func (s *Server) UpdateInstalledPackage(ctx context.Context, request *connect.Re
}

// Set the versionSelection
pkgInstall.Spec.PackageRef.VersionSelection = versionSelection
pkgInstall.Spec.PackageRef.VersionSelection = toOldVendirVSS(versionSelection)

// Allow this PackageInstall to be downgraded
// https://carvel.dev/kapp-controller/docs/v0.32.0/package-consumer-concepts/#downgrading
Expand Down
8 changes: 4 additions & 4 deletions cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_adapters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021-2023 the Kubeapps contributors.
// Copyright 2021-2024 the Kubeapps contributors.
// SPDX-License-Identifier: Apache-2.0

package main
Expand All @@ -13,12 +13,12 @@ import (
"github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/connecterror"
"github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/k8sutils"

"carvel.dev/vendir/pkg/vendir/versions"
vendirversions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
datapackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
kappctrlpackageinstall "github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
vendirversions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1"
kappcorev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1"
"github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils"
Expand Down Expand Up @@ -390,7 +390,7 @@ func (s *Server) buildPkgInstall(installedPackageName, targetCluster, targetName
// },
PackageRef: &packagingv1alpha1.PackageRef{
RefName: packageRefName,
VersionSelection: versionSelection,
VersionSelection: toOldVendirVSS(versionSelection),
},
},
}
Expand Down
Loading
Loading