From dcc1609c3791dfc8595d31cdba24395d7caea99a Mon Sep 17 00:00:00 2001 From: Michael Nelson Date: Wed, 12 Oct 2022 11:13:50 +1100 Subject: [PATCH] Small changes to check Carvel multicluster support. Signed-off-by: Michael Nelson --- .../packages/v1alpha1/server_data_adapters.go | 2 +- script/makefiles/deploy-dev.mk | 7 ++++++- .../docs/latest/tutorials/managing-carvel-packages.md | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_adapters.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_adapters.go index 43d7a19718c..12e91aea434 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_adapters.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_adapters.go @@ -364,7 +364,7 @@ func (s *Server) buildPkgInstall(installedPackageName, targetCluster, targetName // Ensure the selected version can be, actually installed to let the user know before installing elegibleVersion, err := versions.HighestConstrainedVersion([]string{pkgVersion}, vendirversions.VersionSelection{Semver: versionSelection}) if elegibleVersion == "" || err != nil { - return nil, status.Errorf(codes.InvalidArgument, "The selected version %q is not elegible to be installed: %v", pkgVersion, err) + return nil, status.Errorf(codes.InvalidArgument, "The selected version %q is not eligible to be installed: %v", pkgVersion, err) } pkgInstall := &packagingv1alpha1.PackageInstall{ diff --git a/script/makefiles/deploy-dev.mk b/script/makefiles/deploy-dev.mk index 413077c0454..f02cb020287 100644 --- a/script/makefiles/deploy-dev.mk +++ b/script/makefiles/deploy-dev.mk @@ -57,10 +57,15 @@ reset-dev-kubeapps: # The kapp-controller support for the new Package and PackageRepository CRDs is currently # only available in an alpha release. deploy-kapp-controller: - kubectl --kubeconfig=${CLUSTER_CONFIG} apply -f https://github.com/vmware-tanzu/carvel-kapp-controller/releases/download/v0.35.0/release.yml + kubectl --kubeconfig=${CLUSTER_CONFIG} apply -f https://github.com/vmware-tanzu/carvel-kapp-controller/releases/download/v0.41.2/release.yml kubectl --kubeconfig=${CLUSTER_CONFIG} apply -f https://raw.githubusercontent.com/vmware-tanzu/carvel-kapp-controller/develop/examples/packaging-with-repo/package-repository.yml kubectl --kubeconfig=${CLUSTER_CONFIG} apply -f ./site/content/docs/latest/reference/manifests/tce-package-repository.yaml +deploy-kapp-controller-additional: + kubectl --kubeconfig=${ADDITIONAL_CLUSTER_CONFIG} apply -f https://github.com/vmware-tanzu/carvel-kapp-controller/releases/download/v0.41.2/release.yml + kubectl --kubeconfig=${ADDITIONAL_CLUSTER_CONFIG} apply -f https://raw.githubusercontent.com/vmware-tanzu/carvel-kapp-controller/develop/examples/packaging-with-repo/package-repository.yml + kubectl --kubeconfig=${ADDITIONAL_CLUSTER_CONFIG} apply -f ./site/content/docs/latest/reference/manifests/tce-package-repository.yaml + # Add the flux controllers used for testing the kubeapps-apis integration. deploy-flux-controllers: kubectl --kubeconfig=${CLUSTER_CONFIG} apply -f https://github.com/fluxcd/flux2/releases/download/v0.34.0/install.yaml diff --git a/site/content/docs/latest/tutorials/managing-carvel-packages.md b/site/content/docs/latest/tutorials/managing-carvel-packages.md index c2b7be4aec9..6ea09fdb2e1 100644 --- a/site/content/docs/latest/tutorials/managing-carvel-packages.md +++ b/site/content/docs/latest/tutorials/managing-carvel-packages.md @@ -161,7 +161,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: carvel-reconciler - namespace: default + namespace: kubeapps-user-namespace subjects: - kind: ServiceAccount name: carvel-reconciler