diff --git a/.circleci/config.yml b/.circleci/config.yml index dca4b69842b..b37bf1419cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -601,7 +601,7 @@ local_e2e_steps: &local_e2e_steps jobs: test_go: - working_directory: /home/circleci/go/src/github.com/kubeapps/kubeapps + working_directory: /home/circleci/go/src/github.com/vmware-tanzu/kubeapps environment: CGO_ENABLED: "0" <<: *common_envars @@ -622,7 +622,7 @@ jobs: docker run -d --name postgresql --rm --publish 5432:5432 -e ALLOW_EMPTY_PASSWORD=yes bitnami/postgresql:${POSTGRESQL_VERSION} docker run --network container:postgresql -d --name tests cimg/go:${GOLANG_VERSION} tail -f /dev/null docker cp /home/circleci/go tests:/ - docker exec -it tests /bin/sh -c "cd /go/src/github.com/kubeapps/kubeapps/ && make test-db" + docker exec -it tests /bin/sh -c "cd /go/src/github.com/vmware-tanzu/kubeapps/ && make test-db" test_dashboard: environment: # Note that the max old space setting is per worker, so running the tests @@ -670,7 +670,7 @@ jobs: build_go_images: docker: - image: cimg/go:<< pipeline.parameters.GOLANG_VERSION >> - working_directory: /home/circleci/go/src/github.com/kubeapps/kubeapps + working_directory: /home/circleci/go/src/github.com/vmware-tanzu/kubeapps environment: GOPATH: ${HOME}/.go_workspace IMAGES: "kubeops apprepository-controller asset-syncer assetsvc kubeapps-apis" diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 0f837eb12ea..053c1ba4d81 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -10,12 +10,12 @@ This document defines the project governance for Kubeapps. The following code repositories are governed by Kubeapps community and maintained under the `kubeapps\kubeapps` organization. -- [kubeapps](https://github.com/kubeapps/kubeapps): Main Kubeapps codebase. +- [kubeapps](https://github.com/vmware-tanzu/kubeapps): Main Kubeapps codebase. - [hub](https://github.com/kubeapps/hub): Kubeapps Hub UI codebase. ## Community Roles -- **Users**: Members that engage with the Kubeapps community via any medium ([Slack](https://kubernetes.slack.com/messages/kubeapps), [GitHub](https://github.com/kubeapps/kubeapps), etc.). +- **Users**: Members that engage with the Kubeapps community via any medium ([Slack](https://kubernetes.slack.com/messages/kubeapps), [GitHub](https://github.com/vmware-tanzu/kubeapps), etc.). - **Contributors**: Members contributing to projects (documentation, code reviews, responding to issues, participation in proposal discussions, contributing code, etc.). - **Maintainers**: The Kubeapps project leaders. They are responsible for the overall health and direction of the project; final reviewers of PRs and responsible for releases. Maintainers are expected to contribute code and documentation, review PRs including ensuring the quality of code, triage issues, proactively fix bugs and perform maintenance tasks for Kubeapps components. @@ -41,7 +41,7 @@ One of the most important aspects of any open source community is the concept of Proposals should cover the high-level objectives, use cases, and technical recommendations on how to implement them. In general, the community member(s) interested in implementing the proposal should be either deeply engaged in the proposal process or be an author of the proposal. -The proposal should be documented as a separate markdown file pushed to the root of the [design-proposals](./docs/reference/design-proposals) folder in the [Kubeapps repository](https://github.com/kubeapps/kubeapps) via PR. +The proposal should be documented as a separate markdown file pushed to the root of the [design-proposals](./docs/reference/design-proposals) folder in the [Kubeapps repository](https://github.com/vmware-tanzu/kubeapps) via PR. ### Proposal Lifecycle diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 194078648de..9ae0e8d61b0 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -26,4 +26,4 @@ | Engineering Manager | Pepe Baena ([ppbaena](https://github.com/ppbaena)) | | Executive Owner | Arun Goel | -Full list of [Kubeapps contributors](https://github.com/kubeapps/kubeapps/graphs/contributors). +Full list of [Kubeapps contributors](https://github.com/vmware-tanzu/kubeapps/graphs/contributors). diff --git a/Makefile b/Makefile index c3dbd7f4a4b..a4a3aabf92e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Copyright 2017-2022 the Kubeapps contributors. # SPDX-License-Identifier: Apache-2.0 -IMPORT_PATH:= github.com/kubeapps/kubeapps +IMPORT_PATH:= github.com/vmware-tanzu/kubeapps GO = /usr/bin/env go GOFMT = /usr/bin/env gofmt IMAGE_TAG ?= dev-$(shell date +%FT%H-%M-%S-%Z) diff --git a/README.md b/README.md index f5d968153a0..6d5f889f42c 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ See how to deploy and configure [Kubeapps on VMware Tanzu™ Kubernetes Grid™] ## Troubleshooting -If you encounter issues, review the [troubleshooting docs](./chart/kubeapps/README.md#troubleshooting), review our [project board](https://github.com/kubeapps/kubeapps/projects/11), file an [issue](https://github.com/kubeapps/kubeapps/issues), or talk to us on the [#Kubeapps channel](https://kubernetes.slack.com/messages/kubeapps) on the Kubernetes Slack server. +If you encounter issues, review the [troubleshooting docs](./chart/kubeapps/README.md#troubleshooting), review our [project board](https://github.com/vmware-tanzu/kubeapps/projects/11), file an [issue](https://github.com/vmware-tanzu/kubeapps/issues), or talk to us on the [#Kubeapps channel](https://kubernetes.slack.com/messages/kubeapps) on the Kubernetes Slack server. - Click [here](https://slack.k8s.io) to sign up to the Kubernetes Slack org. @@ -56,4 +56,4 @@ If you are ready to jump in and test, add code, or help with documentation, foll ## Changelog -Take a look at the list of [releases](https://github.com/kubeapps/kubeapps/releases) to stay tuned for the latest features and changes. +Take a look at the list of [releases](https://github.com/vmware-tanzu/kubeapps/releases) to stay tuned for the latest features and changes. diff --git a/ROADMAP.md b/ROADMAP.md index 61d3dacf400..59d268488e2 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -4,13 +4,13 @@ **About this document** -This document provides a link to the[ Kubeapps Project issues](https://github.com/kubeapps/kubeapps/issues) list that serves as the up to date description of items that are in the Kubeapps release pipeline. This should serve as a reference point for Kubeapps users and contributors to understand where the project is heading, and help determine if a contribution could be conflicting with a longer term plan. +This document provides a link to the[ Kubeapps Project issues](https://github.com/vmware-tanzu/kubeapps/issues) list that serves as the up to date description of items that are in the Kubeapps release pipeline. This should serve as a reference point for Kubeapps users and contributors to understand where the project is heading, and help determine if a contribution could be conflicting with a longer term plan. ### **How to help?** -Discussion on the roadmap can take place in threads under [Issues](https://github.com/kubeapps/kubeapps/issues). Please open and comment on an issue if you want to provide suggestions and feedback to an item in the roadmap. Please review the roadmap to avoid potential duplicated effort. +Discussion on the roadmap can take place in threads under [Issues](https://github.com/vmware-tanzu/kubeapps/issues). Please open and comment on an issue if you want to provide suggestions and feedback to an item in the roadmap. Please review the roadmap to avoid potential duplicated effort. ### diff --git a/cmd/apprepository-controller/Dockerfile b/cmd/apprepository-controller/Dockerfile index 6d5d9725c86..a4d78af653d 100644 --- a/cmd/apprepository-controller/Dockerfile +++ b/cmd/apprepository-controller/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM bitnami/golang:1.18.0 as builder -WORKDIR /go/src/github.com/kubeapps/kubeapps +WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg COPY cmd cmd @@ -13,10 +13,10 @@ ARG VERSION # https://github.com/golang/go/issues/27719#issuecomment-514747274 RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/kubeapps/kubeapps/cmd/apprepository-controller/cmd.version=$VERSION" ./cmd/apprepository-controller + CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/cmd.version=$VERSION" ./cmd/apprepository-controller FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/kubeapps/kubeapps/apprepository-controller /apprepository-controller +COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/apprepository-controller /apprepository-controller USER 1001 CMD ["/apprepository-controller"] diff --git a/cmd/apprepository-controller/cmd/root.go b/cmd/apprepository-controller/cmd/root.go index 6218dc24b7c..490e57c27f6 100644 --- a/cmd/apprepository-controller/cmd/root.go +++ b/cmd/apprepository-controller/cmd/root.go @@ -7,11 +7,11 @@ import ( "flag" "strings" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/server" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/server" corev1 "k8s.io/api/core/v1" log "k8s.io/klog/v2" ) diff --git a/cmd/apprepository-controller/cmd/root_test.go b/cmd/apprepository-controller/cmd/root_test.go index d34d5603149..ded047e141d 100644 --- a/cmd/apprepository-controller/cmd/root_test.go +++ b/cmd/apprepository-controller/cmd/root_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/server" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/server" v1 "k8s.io/api/core/v1" ) diff --git a/cmd/apprepository-controller/hack/update-codegen.sh b/cmd/apprepository-controller/hack/update-codegen.sh index 2f2a3d57383..e81d08c2397 100755 --- a/cmd/apprepository-controller/hack/update-codegen.sh +++ b/cmd/apprepository-controller/hack/update-codegen.sh @@ -10,14 +10,14 @@ # and then run: git submodule update --remote # 2. Run the this script from the apprepository-controller directory: ./hack/update-codegen.sh # 3. Move the newly generated files over the old ones: -# mv github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1/zz_generated.deepcopy.go ./pkg/apis/apprepository/v1alpha1/zz_generated.deepcopy.go -# rm -rf pkg/client && mv github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client ./pkg +# mv github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1/zz_generated.deepcopy.go ./pkg/apis/apprepository/v1alpha1/zz_generated.deepcopy.go +# rm -rf pkg/client && mv github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client ./pkg # -# What are the situations when one needs to run update-codegen.sh manually after modifying +# What are the situations when one needs to run update-codegen.sh manually after modifying # types.go in apprepository-controller? # Generally if the generated client will change. This can happen for multiple reasons. If you # change to the `AppRepository.Spec` struct the updated struct is imported by the client (so -# regeneration not needed necessarily) but if your change has a complex type (structs and +# regeneration not needed necessarily) but if your change has a complex type (structs and # pointers to structs) the generated client will need to be updated as it includes a deep copy # function. Another cause of your generated client changing is if you update the version of the # client.go library that your project uses. @@ -35,7 +35,7 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/.. CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)} bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis \ + github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis \ apprepository:v1alpha1 \ --output-base "${SCRIPT_ROOT}" \ --go-header-file ${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt diff --git a/cmd/apprepository-controller/main.go b/cmd/apprepository-controller/main.go index b75b617ef86..502e3fe5bbb 100644 --- a/cmd/apprepository-controller/main.go +++ b/cmd/apprepository-controller/main.go @@ -3,7 +3,7 @@ package main -import "github.com/kubeapps/kubeapps/cmd/apprepository-controller/cmd" +import "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/cmd" func main() { cmd.Execute() diff --git a/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1/register.go b/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1/register.go index 0e49cee4124..9f73a019900 100644 --- a/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1/register.go +++ b/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1/register.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository" ) // SchemeGroupVersion is group version used to register these objects diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/clientset.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/clientset.go index 3dbbd90d4dd..0ff573c9f54 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/clientset.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/clientset.go @@ -8,7 +8,7 @@ package versioned import ( "fmt" - kubeappsv1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" + kubeappsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/clientset_generated.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/clientset_generated.go index 108cdeead6d..7ef52cff907 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -6,9 +6,9 @@ package fake import ( - clientset "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" - kubeappsv1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" - fakekubeappsv1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake" + clientset "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + kubeappsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" + fakekubeappsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/register.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/register.go index 54fc1ca3d0c..262a1b754fd 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/register.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/fake/register.go @@ -6,7 +6,7 @@ package fake import ( - kubeappsv1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + kubeappsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme/register.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme/register.go index d3c19b00cdd..3276e00fe06 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme/register.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme/register.go @@ -6,7 +6,7 @@ package scheme import ( - kubeappsv1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + kubeappsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository.go index b599936298a..57d14dd4b3b 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository.go @@ -9,8 +9,8 @@ import ( "context" "time" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - scheme "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + scheme "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository_client.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository_client.go index a75083b8675..d82e462fbe5 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository_client.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/apprepository_client.go @@ -6,8 +6,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository.go index 626a30e2dfe..acadcf2c6bb 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository.go @@ -8,7 +8,7 @@ package fake import ( "context" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository_client.go b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository_client.go index 663fd098f2e..f0ecd78259c 100644 --- a/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository_client.go +++ b/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1/fake/fake_apprepository_client.go @@ -6,7 +6,7 @@ package fake import ( - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/interface.go b/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/interface.go index 59c3de816ad..3b1cf76d21c 100644 --- a/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/interface.go +++ b/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/interface.go @@ -6,8 +6,8 @@ package apprepository import ( - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1" - internalinterfaces "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1" + internalinterfaces "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/apprepository.go b/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/apprepository.go index a545a66351a..7d09ee5b805 100644 --- a/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/apprepository.go +++ b/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/apprepository.go @@ -9,10 +9,10 @@ import ( "context" time "time" - apprepositoryv1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - versioned "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1" + apprepositoryv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + versioned "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + internalinterfaces "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/interface.go b/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/interface.go index 037781c58fd..0bf82e45565 100644 --- a/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/interface.go +++ b/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository/v1alpha1/interface.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cmd/apprepository-controller/pkg/client/informers/externalversions/factory.go b/cmd/apprepository-controller/pkg/client/informers/externalversions/factory.go index 129ecb3e7f2..a0194f2534c 100644 --- a/cmd/apprepository-controller/pkg/client/informers/externalversions/factory.go +++ b/cmd/apprepository-controller/pkg/client/informers/externalversions/factory.go @@ -10,9 +10,9 @@ import ( sync "sync" time "time" - versioned "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" - apprepository "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository" - internalinterfaces "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + apprepository "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/apprepository" + internalinterfaces "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cmd/apprepository-controller/pkg/client/informers/externalversions/generic.go b/cmd/apprepository-controller/pkg/client/informers/externalversions/generic.go index 7f9e27aadff..215a7b3bccb 100644 --- a/cmd/apprepository-controller/pkg/client/informers/externalversions/generic.go +++ b/cmd/apprepository-controller/pkg/client/informers/externalversions/generic.go @@ -8,7 +8,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index d74dc7e6263..42071cd3a08 100644 --- a/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/cmd/apprepository-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -8,7 +8,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + versioned "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1/apprepository.go b/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1/apprepository.go index 25224bb4219..df420d2a39f 100644 --- a/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1/apprepository.go +++ b/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1/apprepository.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/cmd/apprepository-controller/server/controller.go b/cmd/apprepository-controller/server/controller.go index efbb8f1297e..11db17ade99 100644 --- a/cmd/apprepository-controller/server/controller.go +++ b/cmd/apprepository-controller/server/controller.go @@ -11,12 +11,12 @@ import ( "strings" "time" - apprepov1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - clientset "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" - appreposcheme "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" - informers "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions" - listers "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/kube" + apprepov1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + clientset "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + appreposcheme "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" + informers "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions" + listers "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/listers/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/kube" batchv1 "k8s.io/api/batch/v1" batchv1beta1 "k8s.io/api/batch/v1beta1" corev1 "k8s.io/api/core/v1" diff --git a/cmd/apprepository-controller/server/controller_test.go b/cmd/apprepository-controller/server/controller_test.go index ec66c8a33bd..72ca0050a83 100644 --- a/cmd/apprepository-controller/server/controller_test.go +++ b/cmd/apprepository-controller/server/controller_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - apprepov1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + apprepov1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" batchv1 "k8s.io/api/batch/v1" batchv1beta1 "k8s.io/api/batch/v1beta1" corev1 "k8s.io/api/core/v1" diff --git a/cmd/apprepository-controller/server/server.go b/cmd/apprepository-controller/server/server.go index 34a4450b284..f3748e86609 100644 --- a/cmd/apprepository-controller/server/server.go +++ b/cmd/apprepository-controller/server/server.go @@ -6,9 +6,9 @@ package server import ( "fmt" - clientset "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" - informers "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/signals" + clientset "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + informers "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/informers/externalversions" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/signals" corev1 "k8s.io/api/core/v1" kubeinformers "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" diff --git a/cmd/asset-syncer/Dockerfile b/cmd/asset-syncer/Dockerfile index 50aeb470b5a..dd3aea5f4cc 100644 --- a/cmd/asset-syncer/Dockerfile +++ b/cmd/asset-syncer/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM bitnami/golang:1.18.0 as builder -WORKDIR /go/src/github.com/kubeapps/kubeapps +WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg COPY cmd cmd @@ -13,10 +13,10 @@ ARG VERSION # https://github.com/golang/go/issues/27719#issuecomment-514747274 RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/kubeapps/kubeapps/cmd/asset-syncer/cmd.version=$VERSION" ./cmd/asset-syncer + CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/cmd.version=$VERSION" ./cmd/asset-syncer FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/kubeapps/kubeapps/asset-syncer /asset-syncer +COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/asset-syncer /asset-syncer USER 1001 CMD ["/asset-syncer"] diff --git a/cmd/asset-syncer/cmd/root.go b/cmd/asset-syncer/cmd/root.go index 1c1ec0aafb3..c2a3c398385 100644 --- a/cmd/asset-syncer/cmd/root.go +++ b/cmd/asset-syncer/cmd/root.go @@ -7,11 +7,11 @@ import ( "flag" "os" - "github.com/kubeapps/kubeapps/cmd/asset-syncer/server" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" + "github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/server" log "k8s.io/klog/v2" ) diff --git a/cmd/asset-syncer/cmd/root_test.go b/cmd/asset-syncer/cmd/root_test.go index b63e2f2f794..48985b8d863 100644 --- a/cmd/asset-syncer/cmd/root_test.go +++ b/cmd/asset-syncer/cmd/root_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/cmd/asset-syncer/server" + "github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/server" ) func TestParseFlagsCorrect(t *testing.T) { diff --git a/cmd/asset-syncer/main.go b/cmd/asset-syncer/main.go index 3cba5eae2b6..14f2497c0c6 100644 --- a/cmd/asset-syncer/main.go +++ b/cmd/asset-syncer/main.go @@ -3,7 +3,7 @@ package main -import "github.com/kubeapps/kubeapps/cmd/asset-syncer/cmd" +import "github.com/vmware-tanzu/kubeapps/cmd/asset-syncer/cmd" func main() { cmd.Execute() diff --git a/cmd/asset-syncer/server/delete.go b/cmd/asset-syncer/server/delete.go index 8f832d9d1d3..b874a560533 100644 --- a/cmd/asset-syncer/server/delete.go +++ b/cmd/asset-syncer/server/delete.go @@ -6,8 +6,8 @@ package server import ( "fmt" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" log "k8s.io/klog/v2" ) diff --git a/cmd/asset-syncer/server/invalidate-cache.go b/cmd/asset-syncer/server/invalidate-cache.go index 6b3a9bfaca0..4040b5a2586 100644 --- a/cmd/asset-syncer/server/invalidate-cache.go +++ b/cmd/asset-syncer/server/invalidate-cache.go @@ -6,7 +6,7 @@ package server import ( "fmt" - "github.com/kubeapps/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" log "k8s.io/klog/v2" ) diff --git a/cmd/asset-syncer/server/postgresql_db_test.go b/cmd/asset-syncer/server/postgresql_db_test.go index 1914d2e7ace..16cfed099e8 100644 --- a/cmd/asset-syncer/server/postgresql_db_test.go +++ b/cmd/asset-syncer/server/postgresql_db_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" - "github.com/kubeapps/kubeapps/pkg/dbutils/dbutilstest/pgtest" _ "github.com/lib/pq" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils/dbutilstest/pgtest" ) func getInitializedManager(t *testing.T) (*postgresAssetManager, func()) { diff --git a/cmd/asset-syncer/server/postgresql_utils.go b/cmd/asset-syncer/server/postgresql_utils.go index 53557a92f00..5ee106d9cbe 100644 --- a/cmd/asset-syncer/server/postgresql_utils.go +++ b/cmd/asset-syncer/server/postgresql_utils.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" _ "github.com/lib/pq" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" ) var ErrMultipleRows = fmt.Errorf("more than one row returned in query result") diff --git a/cmd/asset-syncer/server/postgresql_utils_test.go b/cmd/asset-syncer/server/postgresql_utils_test.go index 9ffe191d34c..e08ea6b055b 100644 --- a/cmd/asset-syncer/server/postgresql_utils_test.go +++ b/cmd/asset-syncer/server/postgresql_utils_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" ) func getMockManager(t *testing.T) (*postgresAssetManager, sqlmock.Sqlmock, func()) { diff --git a/cmd/asset-syncer/server/sync.go b/cmd/asset-syncer/server/sync.go index faa1b507654..a827407519d 100644 --- a/cmd/asset-syncer/server/sync.go +++ b/cmd/asset-syncer/server/sync.go @@ -8,10 +8,10 @@ import ( "fmt" "time" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" - "github.com/kubeapps/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/pkg/kube" log "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/credentialprovider" ) diff --git a/cmd/asset-syncer/server/utils.go b/cmd/asset-syncer/server/utils.go index 715c647b4c8..84db7dde054 100644 --- a/cmd/asset-syncer/server/utils.go +++ b/cmd/asset-syncer/server/utils.go @@ -25,14 +25,14 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/disintegration/imaging" "github.com/itchyny/gojq" - apprepov1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" - "github.com/kubeapps/kubeapps/pkg/helm" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" - "github.com/kubeapps/kubeapps/pkg/tarutil" "github.com/srwiley/oksvg" "github.com/srwiley/rasterx" + apprepov1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/helm" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/pkg/tarutil" "helm.sh/helm/v3/pkg/chart" helmregistry "helm.sh/helm/v3/pkg/registry" log "k8s.io/klog/v2" @@ -924,7 +924,7 @@ func isURLDomainEqual(url1Str, url2Str string) bool { // asset-syncer/devel // asset-syncer/1.0 // asset-syncer/1.0 (foo v1.0-beta4) -// More info here https://github.com/kubeapps/kubeapps/issues/767#issuecomment-436835938 +// More info here https://github.com/vmware-tanzu/kubeapps/issues/767#issuecomment-436835938 func GetUserAgent(version, userAgentComment string) string { if version == "" && userAgentComment == "" { return "asset-syncer/devel" diff --git a/cmd/asset-syncer/server/utils_test.go b/cmd/asset-syncer/server/utils_test.go index d90f133c741..50cf288ab0b 100644 --- a/cmd/asset-syncer/server/utils_test.go +++ b/cmd/asset-syncer/server/utils_test.go @@ -22,16 +22,16 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/disintegration/imaging" "github.com/google/go-cmp/cmp" - apprepov1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" - "github.com/kubeapps/kubeapps/pkg/helm" - helmfake "github.com/kubeapps/kubeapps/pkg/helm/fake" - helmtest "github.com/kubeapps/kubeapps/pkg/helm/test" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" - tartest "github.com/kubeapps/kubeapps/pkg/tarutil/test" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" + apprepov1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/helm" + helmfake "github.com/vmware-tanzu/kubeapps/pkg/helm/fake" + helmtest "github.com/vmware-tanzu/kubeapps/pkg/helm/test" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" + tartest "github.com/vmware-tanzu/kubeapps/pkg/tarutil/test" "helm.sh/helm/v3/pkg/chart" ) @@ -852,7 +852,7 @@ maintainers: name: Bitnami name: kubeapps sources: - - https://github.com/kubeapps/kubeapps + - https://github.com/vmware-tanzu/kubeapps version: 1.0.0 ` tests := []struct { @@ -879,7 +879,7 @@ version: 1.0.0 Home: "https://kubeapps.com", Keywords: []string{"helm"}, Maintainers: []chart.Maintainer{{Name: "Bitnami", Email: "containers@bitnami.com"}}, - Sources: []string{"https://github.com/kubeapps/kubeapps"}, + Sources: []string{"https://github.com/vmware-tanzu/kubeapps"}, Icon: "https://logo.png", Category: "Infrastructure", ChartVersions: []models.ChartVersion{ @@ -887,7 +887,7 @@ version: 1.0.0 Version: "1.0.0", AppVersion: "2.0.0", Digest: "123", - URLs: []string{"https://github.com/kubeapps/kubeapps"}, + URLs: []string{"https://github.com/vmware-tanzu/kubeapps"}, }, }, }, diff --git a/cmd/assetsvc/Dockerfile b/cmd/assetsvc/Dockerfile index da13c7398cb..a0ae49735af 100644 --- a/cmd/assetsvc/Dockerfile +++ b/cmd/assetsvc/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM bitnami/golang:1.18.0 as builder -WORKDIR /go/src/github.com/kubeapps/kubeapps +WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg COPY cmd cmd @@ -13,10 +13,10 @@ ARG VERSION # https://github.com/golang/go/issues/27719#issuecomment-514747274 RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/kubeapps/kubeapps/cmd/assetsvc/cmd.version=$VERSION" ./cmd/assetsvc + CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/assetsvc/cmd.version=$VERSION" ./cmd/assetsvc FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/kubeapps/kubeapps/assetsvc /assetsvc +COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/assetsvc /assetsvc USER 1001 CMD ["/assetsvc"] diff --git a/cmd/assetsvc/cmd/root.go b/cmd/assetsvc/cmd/root.go index c5258bf0107..604e6a4a7fc 100644 --- a/cmd/assetsvc/cmd/root.go +++ b/cmd/assetsvc/cmd/root.go @@ -7,11 +7,11 @@ import ( "flag" "os" - "github.com/kubeapps/kubeapps/cmd/assetsvc/server" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" + "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/server" log "k8s.io/klog/v2" ) diff --git a/cmd/assetsvc/main.go b/cmd/assetsvc/main.go index 785d442e6db..96bd2e94c6a 100644 --- a/cmd/assetsvc/main.go +++ b/cmd/assetsvc/main.go @@ -3,7 +3,7 @@ package main -import "github.com/kubeapps/kubeapps/cmd/assetsvc/cmd" +import "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/cmd" func main() { cmd.Execute() diff --git a/cmd/assetsvc/pkg/utils/postgres_db_test.go b/cmd/assetsvc/pkg/utils/postgres_db_test.go index 1bf31fec9c2..3c8b7cebbea 100644 --- a/cmd/assetsvc/pkg/utils/postgres_db_test.go +++ b/cmd/assetsvc/pkg/utils/postgres_db_test.go @@ -14,10 +14,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils/dbutilstest" - "github.com/kubeapps/kubeapps/pkg/dbutils/dbutilstest/pgtest" _ "github.com/lib/pq" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils/dbutilstest" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils/dbutilstest/pgtest" ) func getInitializedManager(t *testing.T) (*PostgresAssetManager, func()) { diff --git a/cmd/assetsvc/pkg/utils/postgresql_utils.go b/cmd/assetsvc/pkg/utils/postgresql_utils.go index d91ef0fbb73..0f2fa6a6535 100644 --- a/cmd/assetsvc/pkg/utils/postgresql_utils.go +++ b/cmd/assetsvc/pkg/utils/postgresql_utils.go @@ -10,9 +10,9 @@ import ( "math" "strings" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" _ "github.com/lib/pq" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" ) // TODO(mnelson): standardise error API for package. diff --git a/cmd/assetsvc/pkg/utils/postgresql_utils_test.go b/cmd/assetsvc/pkg/utils/postgresql_utils_test.go index 37914b903d2..4f9983ce3c1 100644 --- a/cmd/assetsvc/pkg/utils/postgresql_utils_test.go +++ b/cmd/assetsvc/pkg/utils/postgresql_utils_test.go @@ -12,8 +12,8 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" ) func getMockManager(t *testing.T) (*PostgresAssetManager, sqlmock.Sqlmock, func()) { diff --git a/cmd/assetsvc/pkg/utils/utils.go b/cmd/assetsvc/pkg/utils/utils.go index 889a4cfced3..c70293674c5 100644 --- a/cmd/assetsvc/pkg/utils/utils.go +++ b/cmd/assetsvc/pkg/utils/utils.go @@ -4,8 +4,8 @@ package utils import ( - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" ) type AssetManager interface { diff --git a/cmd/assetsvc/server/handler.go b/cmd/assetsvc/server/handler.go index 82471764921..7961b3c467b 100644 --- a/cmd/assetsvc/server/handler.go +++ b/cmd/assetsvc/server/handler.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/kubeapps/kubeapps/cmd/assetsvc/pkg/utils" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/response" + "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/pkg/utils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/response" log "k8s.io/klog/v2" ) diff --git a/cmd/assetsvc/server/handler_test.go b/cmd/assetsvc/server/handler_test.go index 4ed1422b1a2..e0ae6a3cacc 100644 --- a/cmd/assetsvc/server/handler_test.go +++ b/cmd/assetsvc/server/handler_test.go @@ -19,10 +19,10 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/disintegration/imaging" - "github.com/kubeapps/kubeapps/cmd/assetsvc/pkg/utils" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" "github.com/stretchr/testify/assert" + "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/pkg/utils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" ) type bodyAPIListResponse struct { diff --git a/cmd/assetsvc/server/server.go b/cmd/assetsvc/server/server.go index c56c4c8ed4d..fdb12fc6640 100644 --- a/cmd/assetsvc/server/server.go +++ b/cmd/assetsvc/server/server.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" "github.com/heptiolabs/healthcheck" - "github.com/kubeapps/kubeapps/cmd/assetsvc/pkg/utils" - "github.com/kubeapps/kubeapps/pkg/dbutils" negroni "github.com/urfave/negroni/v2" + "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/pkg/utils" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" log "k8s.io/klog/v2" ) diff --git a/cmd/assetsvc/server/server_test.go b/cmd/assetsvc/server/server_test.go index f0faf8f79a4..c09ceb6927a 100644 --- a/cmd/assetsvc/server/server_test.go +++ b/cmd/assetsvc/server/server_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" - "github.com/kubeapps/kubeapps/pkg/chart/models" "github.com/stretchr/testify/assert" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" ) // tests the GET /live endpoint diff --git a/cmd/kubeapps-apis/Dockerfile b/cmd/kubeapps-apis/Dockerfile index 8a741e8b56f..d76ff6612a0 100644 --- a/cmd/kubeapps-apis/Dockerfile +++ b/cmd/kubeapps-apis/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM bitnami/golang:1.17.6 as builder -WORKDIR /go/src/github.com/kubeapps/kubeapps +WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg COPY cmd cmd @@ -26,14 +26,14 @@ RUN /tmp/buf lint ./cmd/kubeapps-apis RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ go build \ - -ldflags "-X github.com/kubeapps/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ + -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ ./cmd/kubeapps-apis # Build 'kapp-controller' plugin, version 'v1alpha1' RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ go build \ - -ldflags "-X github.com/kubeapps/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ + -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ -o /kapp-controller-packages-v1alpha1-plugin.so -buildmode=plugin \ ./cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/*.go @@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ go build \ - -ldflags "-X github.com/kubeapps/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ + -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ -o /fluxv2-packages-v1alpha1-plugin.so -buildmode=plugin \ ./cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/*.go @@ -49,7 +49,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ go build \ - -ldflags "-X github.com/kubeapps/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ + -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ -o /helm-packages-v1alpha1-plugin.so -buildmode=plugin \ ./cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/*.go @@ -57,7 +57,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ go build \ - -ldflags "-X github.com/kubeapps/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ + -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd.version=$VERSION" \ -o /resources-v1alpha1-plugin.so -buildmode=plugin \ ./cmd/kubeapps-apis/plugins/resources/v1alpha1/*.go @@ -65,7 +65,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ # are loaded using the dynamic linker. FROM bitnami/minideb:buster COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/kubeapps/kubeapps/kubeapps-apis /kubeapps-apis +COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/kubeapps-apis /kubeapps-apis COPY --from=builder /kapp-controller-packages-v1alpha1-plugin.so /plugins/kapp-controller-packages/ COPY --from=builder /fluxv2-packages-v1alpha1-plugin.so /plugins/fluxv2-packages/ COPY --from=builder /helm-packages-v1alpha1-plugin.so /plugins/helm-packages/ diff --git a/cmd/kubeapps-apis/buf.gen.yaml b/cmd/kubeapps-apis/buf.gen.yaml index fce093d50fa..95698bbe660 100644 --- a/cmd/kubeapps-apis/buf.gen.yaml +++ b/cmd/kubeapps-apis/buf.gen.yaml @@ -6,11 +6,11 @@ plugins: - name: go out: gen opt: - - module=github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen + - module=github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen - name: go-grpc out: gen opt: - - module=github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen + - module=github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen # The following option controls whether the generated interfaces require # the `mustEmbedUnimplemented**Server` method. This method is useful to # ensure that when you add a method to a proto service and regenerate @@ -30,7 +30,7 @@ plugins: - name: grpc-gateway out: gen opt: - - module=github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen + - module=github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen # Consider migrating to openapiv3 once ready # https://github.com/grpc-ecosystem/grpc-gateway/pull/2147 - name: openapiv2 diff --git a/cmd/kubeapps-apis/cmd/root.go b/cmd/kubeapps-apis/cmd/root.go index a1a329ff01d..ef3e15e7b53 100644 --- a/cmd/kubeapps-apis/cmd/root.go +++ b/cmd/kubeapps-apis/cmd/root.go @@ -6,11 +6,11 @@ package cmd import ( "flag" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/server" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/server" log "k8s.io/klog/v2" ) diff --git a/cmd/kubeapps-apis/cmd/root_test.go b/cmd/kubeapps-apis/cmd/root_test.go index 47b26e00ec1..d10d0511074 100644 --- a/cmd/kubeapps-apis/cmd/root_test.go +++ b/cmd/kubeapps-apis/cmd/root_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" ) func TestParseFlagsCorrect(t *testing.T) { diff --git a/cmd/kubeapps-apis/core/packages/v1alpha1/packages.go b/cmd/kubeapps-apis/core/packages/v1alpha1/packages.go index 6f6bb976253..2e4c9b72c1b 100644 --- a/cmd/kubeapps-apis/core/packages/v1alpha1/packages.go +++ b/cmd/kubeapps-apis/core/packages/v1alpha1/packages.go @@ -8,10 +8,10 @@ import ( "fmt" . "github.com/ahmetb/go-linq/v3" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - packages "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + packages "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/core/packages/v1alpha1/packages_test.go b/cmd/kubeapps-apis/core/packages/v1alpha1/packages_test.go index 251eda30126..cb9f79d5dd7 100644 --- a/cmd/kubeapps-apis/core/packages/v1alpha1/packages_test.go +++ b/cmd/kubeapps-apis/core/packages/v1alpha1/packages_test.go @@ -9,9 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugin_test" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugin_test" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/core/packages/v1alpha1/repositories.go b/cmd/kubeapps-apis/core/packages/v1alpha1/repositories.go index ee7b996bd57..2c93ca631d2 100644 --- a/cmd/kubeapps-apis/core/packages/v1alpha1/repositories.go +++ b/cmd/kubeapps-apis/core/packages/v1alpha1/repositories.go @@ -9,9 +9,9 @@ import ( . "github.com/ahmetb/go-linq/v3" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - packages "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + packages "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/core/packages/v1alpha1/repositories_test.go b/cmd/kubeapps-apis/core/packages/v1alpha1/repositories_test.go index ac556ba001b..75817192adc 100644 --- a/cmd/kubeapps-apis/core/packages/v1alpha1/repositories_test.go +++ b/cmd/kubeapps-apis/core/packages/v1alpha1/repositories_test.go @@ -9,9 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugin_test" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugin_test" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins.go b/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins.go index b228dfec99e..8f45de71583 100644 --- a/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins.go +++ b/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins.go @@ -17,9 +17,9 @@ import ( "strings" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/kube" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -351,7 +351,7 @@ func createConfigGetterWithParams(inClusterConfig *rest.Config, serveOpts core.S // It is equivalent to the "Authorization" usual HTTP 1 header // For instance: authorization="Bearer abc" will return "abc" func extractToken(ctx context.Context) (string, error) { - // per https://github.com/kubeapps/kubeapps/issues/3560 + // per https://github.com/vmware-tanzu/kubeapps/issues/3560 // extractToken() to raise an error if there is no metadata with the context. // note, the caller will wrap this as a codes.Unauthenticated status md, ok := metadata.FromIncomingContext(ctx) diff --git a/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins_test.go b/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins_test.go index c86946b7fce..f5ec3a92ba2 100644 --- a/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins_test.go +++ b/cmd/kubeapps-apis/core/plugins/v1alpha1/plugins_test.go @@ -13,9 +13,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/kube" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json b/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json index 0187ad2555a..4ad0dc0b218 100644 --- a/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json +++ b/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json @@ -2,8 +2,8 @@ "swagger": "2.0", "info": { "title": "Kubeapps API", - "description": "[![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/main.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/main)\n \n [Kubeapps](https://github.com/kubeapps/kubeapps) is a web-based UI for deploying and managing applications in Kubernetes clusters.\n \n Note: this API documentation is still in an initial stage and is subject to change. Before coupling to it, please [drop us an issue](https://github.com/kubeapps/kubeapps/issues/new/choose) or reach us [via Slack](https://kubernetes.slack.com/messages/kubeapps) to know more about your use case and see how we can assist you.\n #### Developer Documentation\n - The [Kubeapps architecture overview](https://github.com/kubeapps/kubeapps/blob/main/docs/background/architecture.md).\n - The [Kubeapps Developer Documentation](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/developer/README.md) for instructions on setting up the developer environment for developing on Kubeapps and its components.\n - The [Kubeapps Build Guide](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/developer/build.md) for instructions on setting up the build environment and building Kubeapps from source.\n", - "termsOfService": "https://github.com/kubeapps/kubeapps/blob/main/LICENSE", + "description": "[![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/main.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/main)\n \n [Kubeapps](https://github.com/vmware-tanzu/kubeapps) is a web-based UI for deploying and managing applications in Kubernetes clusters.\n \n Note: this API documentation is still in an initial stage and is subject to change. Before coupling to it, please [drop us an issue](https://github.com/vmware-tanzu/kubeapps/issues/new/choose) or reach us [via Slack](https://kubernetes.slack.com/messages/kubeapps) to know more about your use case and see how we can assist you.\n #### Developer Documentation\n - The [Kubeapps architecture overview](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/background/architecture.md).\n - The [Kubeapps Developer Documentation](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/developer/README.md) for instructions on setting up the developer environment for developing on Kubeapps and its components.\n - The [Kubeapps Build Guide](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/developer/build.md) for instructions on setting up the build environment and building Kubeapps from source.\n", + "termsOfService": "https://github.com/vmware-tanzu/kubeapps/blob/main/LICENSE", "version": "0.1.0", "license": { "name": "Apache-2.0", @@ -3349,7 +3349,7 @@ "properties": { "context": { "$ref": "#/definitions/v1alpha1Context", - "description": "The target context where the package repository is intended to be \ninstalled." + "description": "The target context where the package repository is intended to be\ninstalled." }, "name": { "type": "string", @@ -3365,11 +3365,11 @@ }, "type": { "type": "string", - "title": "Package storage type \nIn general, each plug-in will define an acceptable set of valid types \n- for direct helm plug-in valid values are: helm, oci\n- for flux plug-in currently only supported value is helm. In the\n future, we may add support for git and/or AWS s3-style buckets" + "title": "Package storage type\nIn general, each plug-in will define an acceptable set of valid types\n- for direct helm plug-in valid values are: helm, oci\n- for flux plug-in currently only supported value is helm. In the\n future, we may add support for git and/or AWS s3-style buckets" }, "url": { "type": "string", - "title": "A URL identifying the package repository location. Must contain at \nleast a protocol and host" + "title": "A URL identifying the package repository location. Must contain at\nleast a protocol and host" }, "interval": { "type": "integer", @@ -3390,7 +3390,7 @@ }, "customDetail": { "$ref": "#/definitions/protobufAny", - "title": "Custom data added by the plugin\nA plugin can define custom details for data which is not yet, or \nnever will be specified in the core AddPackageRepositoryRequest \nfields. The use of an `Any` field means that each plugin can define\nthe structure of this message as required, while still satisfying the \ncore interface. \nSee https://developers.google.com/protocol-buffers/docs/proto3#any\nJust for reference, some of the examples that have been chosen not to \nbe part of the core API but rather plugin-specific details are:\n direct-helm:\n - image pull secrets\n - list of oci repositories\n - filter rules\n - sync job pod template" + "title": "Custom data added by the plugin\nA plugin can define custom details for data which is not yet, or\nnever will be specified in the core AddPackageRepositoryRequest\nfields. The use of an `Any` field means that each plugin can define\nthe structure of this message as required, while still satisfying the\ncore interface.\nSee https://developers.google.com/protocol-buffers/docs/proto3#any\nJust for reference, some of the examples that have been chosen not to\nbe part of the core API but rather plugin-specific details are:\n direct-helm:\n - image pull secrets\n - list of oci repositories\n - filter rules\n - sync job pod template" } }, "description": "Request for AddPackageRepository", @@ -4214,7 +4214,7 @@ "title": "pass_credentials allows the credentials from the SecretRef to be passed\non to a host that does not match the host as defined in URL.\nThis flag controls whether or not it is allowed to passing credentials\nwith requests to other domains linked from the repository.\nThis may be needed if the host of the advertised chart URLs in the\nindex differs from the defined URL. Optional" } }, - "description": "Authentication/authorization to provide client’s identity when connecting\nto a package repository.\nThere are 6 total distinct use cases we may support:\n1) None (Public)\n2) Basic Auth\n3) Bearer Token \n4) Custom Authorization Header\n5) Docker Registry Credentials (for OCI only)\n6) TLS certificate and key\n\nNote that (1)-(4) may be done over HTTP or HTTPs without any custom \ncertificates or certificate authority \n(1) is handled by not not having PackageRepositoryAuth field on\n the parent object\na given plug-in may or may not support a given authentication type. \nFor example\n - direct-helm plug-in does not currently support (6), while flux does\n - flux plug-in does not support (3) or (4) while direct-helm does", + "description": "Authentication/authorization to provide client’s identity when connecting\nto a package repository.\nThere are 6 total distinct use cases we may support:\n1) None (Public)\n2) Basic Auth\n3) Bearer Token\n4) Custom Authorization Header\n5) Docker Registry Credentials (for OCI only)\n6) TLS certificate and key\n\nNote that (1)-(4) may be done over HTTP or HTTPs without any custom\ncertificates or certificate authority\n(1) is handled by not not having PackageRepositoryAuth field on\n the parent object\na given plug-in may or may not support a given authentication type.\nFor example\n - direct-helm plug-in does not currently support (6), while flux does\n - flux plug-in does not support (3) or (4) while direct-helm does", "title": "PackageRepositoryAuth" }, "v1alpha1PackageRepositoryDetail": { @@ -4251,11 +4251,11 @@ }, "tlsConfig": { "$ref": "#/definitions/v1alpha1PackageRepositoryTlsConfig", - "title": "TLS-specific parameters for connecting to a repository. \nIf the cert authority was configured for this repository, then in the context \nof GetPackageRepositoryDetail() operation, the PackageRepositoryTlsConfig will ALWAYS \ncontain an existing SecretKeyReference, rather that cert_authority field" + "title": "TLS-specific parameters for connecting to a repository.\nIf the cert authority was configured for this repository, then in the context\nof GetPackageRepositoryDetail() operation, the PackageRepositoryTlsConfig will ALWAYS\ncontain an existing SecretKeyReference, rather that cert_authority field" }, "auth": { "$ref": "#/definitions/v1alpha1PackageRepositoryAuth", - "title": "authentication parameters for connecting to a repository.\nIf Basic Auth or TLS or Docker Creds Auth was configured for this repository,\nthen in the context of GetPackageRepositoryDetail() operation, the \nPackageRepositoryAuth will ALWAYS contain an existing SecretKeyReference, \nrather that string values that may have been used when package repository was created\nfield" + "title": "authentication parameters for connecting to a repository.\nIf Basic Auth or TLS or Docker Creds Auth was configured for this repository,\nthen in the context of GetPackageRepositoryDetail() operation, the\nPackageRepositoryAuth will ALWAYS contain an existing SecretKeyReference,\nrather that string values that may have been used when package repository was created\nfield" }, "customDetail": { "$ref": "#/definitions/protobufAny", @@ -4474,7 +4474,7 @@ "properties": { "name": { "type": "string", - "title": "The name of an existing secret in the same namespace as the object \nthat refers to it (e.g. PackageRepository), containing authentication \ncredentials for the said package repository.\n- For HTTP/S basic auth the secret must be of type \n \"kubernetes.io/basic-auth\" or opaque and contain username and\n password fields\n- For TLS the secret must be of type \"kubernetes.io/tls\" or opaque \n and contain a certFile and keyFile, and/or\n caCert fields.\n- For Bearer or Custom Auth, the secret must be opaque, and \n the key must be provided\n- For Docker Registry Credentials (OCI registries) the secret\n must of of type \"kubernetes.io/dockerconfigjson”\nFor more details, refer to \nhttps://kubernetes.io/docs/concepts/configuration/secret/" + "title": "The name of an existing secret in the same namespace as the object\nthat refers to it (e.g. PackageRepository), containing authentication\ncredentials for the said package repository.\n- For HTTP/S basic auth the secret must be of type\n \"kubernetes.io/basic-auth\" or opaque and contain username and\n password fields\n- For TLS the secret must be of type \"kubernetes.io/tls\" or opaque\n and contain a certFile and keyFile, and/or\n caCert fields.\n- For Bearer or Custom Auth, the secret must be opaque, and\n the key must be provided\n- For Docker Registry Credentials (OCI registries) the secret\n must of of type \"kubernetes.io/dockerconfigjson”\nFor more details, refer to\nhttps://kubernetes.io/docs/concepts/configuration/secret/" }, "key": { "type": "string", @@ -4564,6 +4564,6 @@ ], "externalDocs": { "description": "Kuebapps GitHub repository", - "url": "https://github.com/kubeapps/kubeapps" + "url": "https://github.com/vmware-tanzu/kubeapps" } } diff --git a/cmd/kubeapps-apis/gen/apidocs.pb.go b/cmd/kubeapps-apis/gen/apidocs.pb.go index 1a290db99af..40da123fd01 100644 --- a/cmd/kubeapps-apis/gen/apidocs.pb.go +++ b/cmd/kubeapps-apis/gen/apidocs.pb.go @@ -33,55 +33,56 @@ var file_kubeappsapis_apidocs_v1alpha1_apidocs_proto_rawDesc = []byte{ 0x6f, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0xee, 0x0c, 0x5a, - 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, - 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, - 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, - 0x67, 0x65, 0x6e, 0x92, 0x41, 0xb6, 0x0c, 0x12, 0xa7, 0x0a, 0x0a, 0x0c, 0x4b, 0x75, 0x62, 0x65, - 0x61, 0x70, 0x70, 0x73, 0x20, 0x41, 0x50, 0x49, 0x12, 0x98, 0x09, 0x5b, 0x21, 0x5b, 0x43, 0x69, - 0x72, 0x63, 0x6c, 0x65, 0x43, 0x49, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, - 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x68, 0x2f, - 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, - 0x73, 0x2f, 0x74, 0x72, 0x65, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x73, 0x76, 0x67, 0x3f, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x73, 0x76, 0x67, 0x29, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x8e, 0x0d, 0x5a, + 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, + 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, + 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, + 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x92, 0x41, 0xd2, 0x0c, 0x12, 0xbf, 0x0a, 0x0a, 0x0c, + 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x41, 0x50, 0x49, 0x12, 0xac, 0x09, 0x5b, + 0x21, 0x5b, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x43, 0x49, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, - 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x65, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x29, - 0x0a, 0x20, 0x0a, 0x20, 0x5b, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x5d, 0x28, 0x68, - 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, - 0x70, 0x70, 0x73, 0x29, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x77, 0x65, 0x62, 0x2d, 0x62, 0x61, - 0x73, 0x65, 0x64, 0x20, 0x55, 0x49, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x64, 0x65, 0x70, 0x6c, 0x6f, - 0x79, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x69, 0x6e, - 0x67, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x69, - 0x6e, 0x20, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x20, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x0a, 0x20, 0x0a, 0x20, 0x4e, 0x6f, 0x74, 0x65, 0x3a, 0x20, - 0x74, 0x68, 0x69, 0x73, 0x20, 0x41, 0x50, 0x49, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x73, 0x20, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x20, - 0x69, 0x6e, 0x20, 0x61, 0x6e, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x20, 0x73, 0x74, - 0x61, 0x67, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x73, 0x20, 0x73, 0x75, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x2e, 0x20, 0x42, 0x65, - 0x66, 0x6f, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x75, 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, - 0x20, 0x69, 0x74, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x5b, 0x64, 0x72, 0x6f, - 0x70, 0x20, 0x75, 0x73, 0x20, 0x61, 0x6e, 0x20, 0x69, 0x73, 0x73, 0x75, 0x65, 0x5d, 0x28, 0x68, - 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, - 0x70, 0x70, 0x73, 0x2f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x2f, 0x6e, 0x65, 0x77, 0x2f, 0x63, - 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x29, 0x20, 0x6f, 0x72, 0x20, 0x72, 0x65, 0x61, 0x63, 0x68, 0x20, - 0x75, 0x73, 0x20, 0x5b, 0x76, 0x69, 0x61, 0x20, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x5d, 0x28, 0x68, - 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, - 0x73, 0x2e, 0x73, 0x6c, 0x61, 0x63, 0x6b, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x29, 0x20, 0x74, - 0x6f, 0x20, 0x6b, 0x6e, 0x6f, 0x77, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x62, 0x6f, 0x75, - 0x74, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x75, 0x73, 0x65, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, - 0x61, 0x6e, 0x64, 0x20, 0x73, 0x65, 0x65, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x77, 0x65, 0x20, 0x63, - 0x61, 0x6e, 0x20, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x20, 0x79, 0x6f, 0x75, 0x2e, 0x0a, 0x20, - 0x23, 0x23, 0x23, 0x23, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x20, 0x44, - 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x2d, 0x20, - 0x54, 0x68, 0x65, 0x20, 0x5b, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x61, 0x72, - 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x76, - 0x69, 0x65, 0x77, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, + 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x65, 0x65, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, + 0x73, 0x76, 0x67, 0x3f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x73, 0x76, 0x67, 0x29, 0x5d, 0x28, + 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x63, 0x69, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x68, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, + 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x65, 0x65, 0x2f, 0x6d, + 0x61, 0x69, 0x6e, 0x29, 0x0a, 0x20, 0x0a, 0x20, 0x5b, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, + 0x73, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, + 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x29, 0x20, 0x69, 0x73, 0x20, + 0x61, 0x20, 0x77, 0x65, 0x62, 0x2d, 0x62, 0x61, 0x73, 0x65, 0x64, 0x20, 0x55, 0x49, 0x20, 0x66, + 0x6f, 0x72, 0x20, 0x64, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, + 0x65, 0x74, 0x65, 0x73, 0x20, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x0a, 0x20, + 0x0a, 0x20, 0x4e, 0x6f, 0x74, 0x65, 0x3a, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x41, 0x50, 0x49, + 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, + 0x73, 0x20, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x20, 0x69, 0x6e, 0x20, 0x61, 0x6e, 0x20, 0x69, 0x6e, + 0x69, 0x74, 0x69, 0x61, 0x6c, 0x20, 0x73, 0x74, 0x61, 0x67, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x69, 0x73, 0x20, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x2e, 0x20, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x75, + 0x70, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x69, 0x74, 0x2c, 0x20, 0x70, 0x6c, 0x65, + 0x61, 0x73, 0x65, 0x20, 0x5b, 0x64, 0x72, 0x6f, 0x70, 0x20, 0x75, 0x73, 0x20, 0x61, 0x6e, 0x20, + 0x69, 0x73, 0x73, 0x75, 0x65, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, + 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, + 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x2f, 0x6e, 0x65, 0x77, 0x2f, 0x63, 0x68, 0x6f, 0x6f, 0x73, + 0x65, 0x29, 0x20, 0x6f, 0x72, 0x20, 0x72, 0x65, 0x61, 0x63, 0x68, 0x20, 0x75, 0x73, 0x20, 0x5b, + 0x76, 0x69, 0x61, 0x20, 0x53, 0x6c, 0x61, 0x63, 0x6b, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, + 0x3a, 0x2f, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x2e, 0x73, 0x6c, + 0x61, 0x63, 0x6b, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, + 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x29, 0x20, 0x74, 0x6f, 0x20, 0x6b, 0x6e, + 0x6f, 0x77, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x20, 0x79, 0x6f, + 0x75, 0x72, 0x20, 0x75, 0x73, 0x65, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x73, 0x65, 0x65, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x77, 0x65, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x61, + 0x73, 0x73, 0x69, 0x73, 0x74, 0x20, 0x79, 0x6f, 0x75, 0x2e, 0x0a, 0x20, 0x23, 0x23, 0x23, 0x23, + 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x20, 0x44, 0x6f, 0x63, 0x75, 0x6d, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x2d, 0x20, 0x54, 0x68, 0x65, 0x20, + 0x5b, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, + 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x76, 0x69, 0x65, 0x77, 0x5d, + 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x64, 0x6f, 0x63, 0x73, 0x2f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2f, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, @@ -89,54 +90,55 @@ var file_kubeappsapis_apidocs_v1alpha1_apidocs_proto_rawDesc = []byte{ 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x20, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, - 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x64, - 0x6f, 0x63, 0x73, 0x2f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x2f, 0x64, 0x65, - 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x2f, 0x52, 0x45, 0x41, 0x44, 0x4d, 0x45, 0x2e, 0x6d, + 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, + 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, + 0x69, 0x6e, 0x2f, 0x64, 0x6f, 0x63, 0x73, 0x2f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, + 0x65, 0x2f, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x2f, 0x52, 0x45, 0x41, 0x44, + 0x4d, 0x45, 0x2e, 0x6d, 0x64, 0x29, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x72, + 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, + 0x6e, 0x67, 0x20, 0x75, 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, + 0x70, 0x65, 0x72, 0x20, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x6f, + 0x6e, 0x20, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x69, + 0x74, 0x73, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x0a, 0x20, + 0x2d, 0x20, 0x54, 0x68, 0x65, 0x20, 0x5b, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, + 0x42, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x47, 0x75, 0x69, 0x64, 0x65, 0x5d, 0x28, 0x68, 0x74, 0x74, + 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, + 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, + 0x64, 0x6f, 0x63, 0x73, 0x2f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x2f, 0x64, + 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x6d, 0x64, 0x29, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x75, - 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x20, - 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, - 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x6f, 0x6e, 0x20, 0x4b, 0x75, - 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x74, 0x73, 0x20, 0x63, - 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x0a, 0x20, 0x2d, 0x20, 0x54, 0x68, - 0x65, 0x20, 0x5b, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x42, 0x75, 0x69, 0x6c, - 0x64, 0x20, 0x47, 0x75, 0x69, 0x64, 0x65, 0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, - 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, - 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, - 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x64, 0x6f, 0x63, 0x73, 0x2f, 0x72, 0x65, 0x66, - 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x2f, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, - 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x6d, 0x64, 0x29, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, - 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x73, - 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x75, 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, - 0x69, 0x6c, 0x64, 0x20, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x20, - 0x61, 0x6e, 0x64, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x4b, 0x75, 0x62, - 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x2e, 0x0a, 0x1a, 0x36, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, - 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, - 0x61, 0x69, 0x6e, 0x2f, 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x2a, 0x3d, 0x0a, 0x0a, 0x41, - 0x70, 0x61, 0x63, 0x68, 0x65, 0x2d, 0x32, 0x2e, 0x30, 0x12, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x3a, - 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, - 0x45, 0x2d, 0x32, 0x2e, 0x30, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x32, 0x05, 0x30, 0x2e, 0x31, 0x2e, - 0x30, 0x1a, 0x0e, 0x31, 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x3a, 0x38, 0x30, 0x38, - 0x30, 0x22, 0x05, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2a, 0x02, 0x01, 0x02, 0x32, 0x10, 0x61, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, - 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, - 0x52, 0x50, 0x0a, 0x03, 0x34, 0x30, 0x31, 0x12, 0x49, 0x0a, 0x47, 0x52, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, - 0x72, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, - 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x2e, 0x5a, 0x23, 0x0a, 0x21, 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, - 0x74, 0x68, 0x12, 0x13, 0x08, 0x02, 0x1a, 0x0d, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x02, 0x62, 0x10, 0x0a, 0x0e, 0x0a, 0x0a, 0x41, 0x70, 0x69, - 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x12, 0x00, 0x72, 0x42, 0x0a, 0x1a, 0x4b, 0x75, 0x65, - 0x62, 0x61, 0x70, 0x70, 0x73, 0x20, 0x47, 0x69, 0x74, 0x48, 0x75, 0x62, 0x20, 0x72, 0x65, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x24, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, - 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, - 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x62, 0x06, 0x70, + 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x20, 0x65, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x62, 0x75, 0x69, 0x6c, + 0x64, 0x69, 0x6e, 0x67, 0x20, 0x4b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x20, 0x66, 0x72, + 0x6f, 0x6d, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x0a, 0x1a, 0x3a, 0x68, 0x74, 0x74, + 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, + 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, + 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x2a, 0x3d, 0x0a, 0x0a, 0x41, 0x70, 0x61, 0x63, 0x68, + 0x65, 0x2d, 0x32, 0x2e, 0x30, 0x12, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, + 0x77, 0x2e, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, + 0x65, 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x2d, 0x32, 0x2e, + 0x30, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x32, 0x05, 0x30, 0x2e, 0x31, 0x2e, 0x30, 0x1a, 0x0e, 0x31, + 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x3a, 0x38, 0x30, 0x38, 0x30, 0x22, 0x05, 0x2f, + 0x61, 0x70, 0x69, 0x73, 0x2a, 0x02, 0x01, 0x02, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x52, 0x50, 0x0a, 0x03, + 0x34, 0x30, 0x31, 0x12, 0x49, 0x0a, 0x47, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, + 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x64, 0x6f, + 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x70, 0x65, 0x72, 0x6d, + 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x5a, 0x23, + 0x0a, 0x21, 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x12, 0x13, + 0x08, 0x02, 0x1a, 0x0d, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x02, 0x62, 0x10, 0x0a, 0x0e, 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, + 0x75, 0x74, 0x68, 0x12, 0x00, 0x72, 0x46, 0x0a, 0x1a, 0x4b, 0x75, 0x65, 0x62, 0x61, 0x70, 0x70, + 0x73, 0x20, 0x47, 0x69, 0x74, 0x48, 0x75, 0x62, 0x20, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x6f, 0x72, 0x79, 0x12, 0x28, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, + 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } diff --git a/cmd/kubeapps-apis/gen/core/packages/v1alpha1/packages.pb.go b/cmd/kubeapps-apis/gen/core/packages/v1alpha1/packages.pb.go index c15fdaddc66..58944b86398 100644 --- a/cmd/kubeapps-apis/gen/core/packages/v1alpha1/packages.pb.go +++ b/cmd/kubeapps-apis/gen/core/packages/v1alpha1/packages.pb.go @@ -11,7 +11,7 @@ package v1alpha1 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -3457,12 +3457,12 @@ var file_kubeappsapis_core_packages_v1alpha1_packages_proto_rawDesc = []byte{ 0x7d, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x72, 0x65, 0x66, - 0x73, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, - 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, - 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, + 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, + 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x72, 0x65, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, + 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/kubeapps-apis/gen/core/packages/v1alpha1/repositories.pb.go b/cmd/kubeapps-apis/gen/core/packages/v1alpha1/repositories.pb.go index e450a1d8754..6a5aac73071 100644 --- a/cmd/kubeapps-apis/gen/core/packages/v1alpha1/repositories.pb.go +++ b/cmd/kubeapps-apis/gen/core/packages/v1alpha1/repositories.pb.go @@ -11,7 +11,7 @@ package v1alpha1 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -1837,12 +1837,13 @@ var file_kubeappsapis_core_packages_v1alpha1_repositories_proto_rawDesc = []byte 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x72, 0x65, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, - 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, - 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, - 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, + 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, + 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, + 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, + 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/cmd/kubeapps-apis/gen/core/plugins/v1alpha1/plugins.pb.go b/cmd/kubeapps-apis/gen/core/plugins/v1alpha1/plugins.pb.go index dd0180ec6d6..33575f61a26 100644 --- a/cmd/kubeapps-apis/gen/core/plugins/v1alpha1/plugins.pb.go +++ b/cmd/kubeapps-apis/gen/core/plugins/v1alpha1/plugins.pb.go @@ -231,12 +231,12 @@ var file_kubeappsapis_core_plugins_v1alpha1_plugins_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x12, 0x29, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x2d, - 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x42, 0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, - 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, - 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x6f, - 0x72, 0x65, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x42, 0x4e, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, + 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, + 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x76, + 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.go b/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.go index 5348f413581..7eeefa7e4ad 100644 --- a/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.go @@ -11,8 +11,8 @@ package v1alpha1 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - _ "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + _ "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -290,13 +290,13 @@ var file_kubeappsapis_plugins_fluxv2_packages_v1alpha1_fluxv2_proto_rawDesc = [] 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x66, 0x6c, 0x75, 0x78, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x72, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, - 0x69, 0x65, 0x73, 0x42, 0x55, 0x5a, 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, - 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, - 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, - 0x73, 0x2f, 0x66, 0x6c, 0x75, 0x78, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, - 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x69, 0x65, 0x73, 0x42, 0x59, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, + 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, + 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x6c, + 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x66, 0x6c, 0x75, 0x78, 0x76, 0x32, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_kubeappsapis_plugins_fluxv2_packages_v1alpha1_fluxv2_proto_goTypes = []interface{}{ diff --git a/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.gw.go b/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.gw.go index 4da2563735b..6bd45b24219 100644 --- a/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.gw.go +++ b/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2.pb.gw.go @@ -15,7 +15,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1_1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" @@ -37,7 +37,7 @@ var ( ) func request_FluxV2PackagesService_GetAvailablePackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetAvailablePackageSummariesRequest + var protoReq v1alpha1_1.GetAvailablePackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -53,7 +53,7 @@ func request_FluxV2PackagesService_GetAvailablePackageSummaries_0(ctx context.Co } func local_request_FluxV2PackagesService_GetAvailablePackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetAvailablePackageSummariesRequest + var protoReq v1alpha1_1.GetAvailablePackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -73,7 +73,7 @@ var ( ) func request_FluxV2PackagesService_GetAvailablePackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetAvailablePackageDetailRequest + var protoReq v1alpha1_1.GetAvailablePackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -126,7 +126,7 @@ func request_FluxV2PackagesService_GetAvailablePackageDetail_0(ctx context.Conte } func local_request_FluxV2PackagesService_GetAvailablePackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetAvailablePackageDetailRequest + var protoReq v1alpha1_1.GetAvailablePackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -183,7 +183,7 @@ var ( ) func request_FluxV2PackagesService_GetAvailablePackageVersions_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetAvailablePackageVersionsRequest + var protoReq v1alpha1_1.GetAvailablePackageVersionsRequest var metadata runtime.ServerMetadata var ( @@ -236,7 +236,7 @@ func request_FluxV2PackagesService_GetAvailablePackageVersions_0(ctx context.Con } func local_request_FluxV2PackagesService_GetAvailablePackageVersions_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetAvailablePackageVersionsRequest + var protoReq v1alpha1_1.GetAvailablePackageVersionsRequest var metadata runtime.ServerMetadata var ( @@ -293,7 +293,7 @@ var ( ) func request_FluxV2PackagesService_GetInstalledPackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetInstalledPackageSummariesRequest + var protoReq v1alpha1_1.GetInstalledPackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -309,7 +309,7 @@ func request_FluxV2PackagesService_GetInstalledPackageSummaries_0(ctx context.Co } func local_request_FluxV2PackagesService_GetInstalledPackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetInstalledPackageSummariesRequest + var protoReq v1alpha1_1.GetInstalledPackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -329,7 +329,7 @@ var ( ) func request_FluxV2PackagesService_GetInstalledPackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetInstalledPackageDetailRequest + var protoReq v1alpha1_1.GetInstalledPackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -382,7 +382,7 @@ func request_FluxV2PackagesService_GetInstalledPackageDetail_0(ctx context.Conte } func local_request_FluxV2PackagesService_GetInstalledPackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetInstalledPackageDetailRequest + var protoReq v1alpha1_1.GetInstalledPackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -435,7 +435,7 @@ func local_request_FluxV2PackagesService_GetInstalledPackageDetail_0(ctx context } func request_FluxV2PackagesService_CreateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.CreateInstalledPackageRequest + var protoReq v1alpha1_1.CreateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -452,7 +452,7 @@ func request_FluxV2PackagesService_CreateInstalledPackage_0(ctx context.Context, } func local_request_FluxV2PackagesService_CreateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.CreateInstalledPackageRequest + var protoReq v1alpha1_1.CreateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -469,7 +469,7 @@ func local_request_FluxV2PackagesService_CreateInstalledPackage_0(ctx context.Co } func request_FluxV2PackagesService_UpdateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.UpdateInstalledPackageRequest + var protoReq v1alpha1_1.UpdateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -523,7 +523,7 @@ func request_FluxV2PackagesService_UpdateInstalledPackage_0(ctx context.Context, } func local_request_FluxV2PackagesService_UpdateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.UpdateInstalledPackageRequest + var protoReq v1alpha1_1.UpdateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -581,7 +581,7 @@ var ( ) func request_FluxV2PackagesService_DeleteInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.DeleteInstalledPackageRequest + var protoReq v1alpha1_1.DeleteInstalledPackageRequest var metadata runtime.ServerMetadata var ( @@ -634,7 +634,7 @@ func request_FluxV2PackagesService_DeleteInstalledPackage_0(ctx context.Context, } func local_request_FluxV2PackagesService_DeleteInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.DeleteInstalledPackageRequest + var protoReq v1alpha1_1.DeleteInstalledPackageRequest var metadata runtime.ServerMetadata var ( @@ -691,7 +691,7 @@ var ( ) func request_FluxV2PackagesService_GetInstalledPackageResourceRefs_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2PackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetInstalledPackageResourceRefsRequest + var protoReq v1alpha1_1.GetInstalledPackageResourceRefsRequest var metadata runtime.ServerMetadata var ( @@ -744,7 +744,7 @@ func request_FluxV2PackagesService_GetInstalledPackageResourceRefs_0(ctx context } func local_request_FluxV2PackagesService_GetInstalledPackageResourceRefs_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2PackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetInstalledPackageResourceRefsRequest + var protoReq v1alpha1_1.GetInstalledPackageResourceRefsRequest var metadata runtime.ServerMetadata var ( @@ -797,7 +797,7 @@ func local_request_FluxV2PackagesService_GetInstalledPackageResourceRefs_0(ctx c } func request_FluxV2RepositoriesService_AddPackageRepository_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2RepositoriesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.AddPackageRepositoryRequest + var protoReq v1alpha1_1.AddPackageRepositoryRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -814,7 +814,7 @@ func request_FluxV2RepositoriesService_AddPackageRepository_0(ctx context.Contex } func local_request_FluxV2RepositoriesService_AddPackageRepository_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2RepositoriesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.AddPackageRepositoryRequest + var protoReq v1alpha1_1.AddPackageRepositoryRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -835,7 +835,7 @@ var ( ) func request_FluxV2RepositoriesService_GetPackageRepositoryDetail_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2RepositoriesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetPackageRepositoryDetailRequest + var protoReq v1alpha1_1.GetPackageRepositoryDetailRequest var metadata runtime.ServerMetadata var ( @@ -908,7 +908,7 @@ func request_FluxV2RepositoriesService_GetPackageRepositoryDetail_0(ctx context. } func local_request_FluxV2RepositoriesService_GetPackageRepositoryDetail_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2RepositoriesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetPackageRepositoryDetailRequest + var protoReq v1alpha1_1.GetPackageRepositoryDetailRequest var metadata runtime.ServerMetadata var ( @@ -985,7 +985,7 @@ var ( ) func request_FluxV2RepositoriesService_GetPackageRepositorySummaries_0(ctx context.Context, marshaler runtime.Marshaler, client FluxV2RepositoriesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetPackageRepositorySummariesRequest + var protoReq v1alpha1_1.GetPackageRepositorySummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -1001,7 +1001,7 @@ func request_FluxV2RepositoriesService_GetPackageRepositorySummaries_0(ctx conte } func local_request_FluxV2RepositoriesService_GetPackageRepositorySummaries_0(ctx context.Context, marshaler runtime.Marshaler, server FluxV2RepositoriesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1.GetPackageRepositorySummariesRequest + var protoReq v1alpha1_1.GetPackageRepositorySummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { diff --git a/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2_grpc.pb.go b/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2_grpc.pb.go index e515bdf5022..d2992a3ac2f 100644 --- a/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2_grpc.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1/fluxv2_grpc.pb.go @@ -8,7 +8,7 @@ package v1alpha1 import ( context "context" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.go b/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.go index a53be0e75aa..df644d33d19 100644 --- a/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.go @@ -11,8 +11,8 @@ package v1alpha1 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - _ "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + _ "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -449,13 +449,13 @@ var file_kubeappsapis_plugins_helm_packages_v1alpha1_helm_proto_rawDesc = []byte 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x7d, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x72, 0x65, 0x66, 0x73, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, - 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, - 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x6c, 0x75, 0x67, - 0x69, 0x6e, 0x73, 0x2f, 0x68, 0x65, 0x6c, 0x6d, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, - 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x65, 0x72, 0x65, 0x66, 0x73, 0x42, 0x57, 0x5a, 0x55, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, + 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, + 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, + 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x68, 0x65, 0x6c, 0x6d, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.gw.go b/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.gw.go index 66351a7dbf4..ded856ae3ba 100644 --- a/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.gw.go +++ b/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm.pb.gw.go @@ -15,7 +15,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - v1alpha1_1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1_0 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" @@ -37,7 +37,7 @@ var ( ) func request_HelmPackagesService_GetAvailablePackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetAvailablePackageSummariesRequest + var protoReq v1alpha1_0.GetAvailablePackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -53,7 +53,7 @@ func request_HelmPackagesService_GetAvailablePackageSummaries_0(ctx context.Cont } func local_request_HelmPackagesService_GetAvailablePackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetAvailablePackageSummariesRequest + var protoReq v1alpha1_0.GetAvailablePackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -73,7 +73,7 @@ var ( ) func request_HelmPackagesService_GetAvailablePackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetAvailablePackageDetailRequest + var protoReq v1alpha1_0.GetAvailablePackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -126,7 +126,7 @@ func request_HelmPackagesService_GetAvailablePackageDetail_0(ctx context.Context } func local_request_HelmPackagesService_GetAvailablePackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetAvailablePackageDetailRequest + var protoReq v1alpha1_0.GetAvailablePackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -183,7 +183,7 @@ var ( ) func request_HelmPackagesService_GetAvailablePackageVersions_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetAvailablePackageVersionsRequest + var protoReq v1alpha1_0.GetAvailablePackageVersionsRequest var metadata runtime.ServerMetadata var ( @@ -236,7 +236,7 @@ func request_HelmPackagesService_GetAvailablePackageVersions_0(ctx context.Conte } func local_request_HelmPackagesService_GetAvailablePackageVersions_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetAvailablePackageVersionsRequest + var protoReq v1alpha1_0.GetAvailablePackageVersionsRequest var metadata runtime.ServerMetadata var ( @@ -293,7 +293,7 @@ var ( ) func request_HelmPackagesService_GetInstalledPackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetInstalledPackageSummariesRequest + var protoReq v1alpha1_0.GetInstalledPackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -309,7 +309,7 @@ func request_HelmPackagesService_GetInstalledPackageSummaries_0(ctx context.Cont } func local_request_HelmPackagesService_GetInstalledPackageSummaries_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetInstalledPackageSummariesRequest + var protoReq v1alpha1_0.GetInstalledPackageSummariesRequest var metadata runtime.ServerMetadata if err := req.ParseForm(); err != nil { @@ -329,7 +329,7 @@ var ( ) func request_HelmPackagesService_GetInstalledPackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetInstalledPackageDetailRequest + var protoReq v1alpha1_0.GetInstalledPackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -382,7 +382,7 @@ func request_HelmPackagesService_GetInstalledPackageDetail_0(ctx context.Context } func local_request_HelmPackagesService_GetInstalledPackageDetail_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetInstalledPackageDetailRequest + var protoReq v1alpha1_0.GetInstalledPackageDetailRequest var metadata runtime.ServerMetadata var ( @@ -435,7 +435,7 @@ func local_request_HelmPackagesService_GetInstalledPackageDetail_0(ctx context.C } func request_HelmPackagesService_CreateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.CreateInstalledPackageRequest + var protoReq v1alpha1_0.CreateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -452,7 +452,7 @@ func request_HelmPackagesService_CreateInstalledPackage_0(ctx context.Context, m } func local_request_HelmPackagesService_CreateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.CreateInstalledPackageRequest + var protoReq v1alpha1_0.CreateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -469,7 +469,7 @@ func local_request_HelmPackagesService_CreateInstalledPackage_0(ctx context.Cont } func request_HelmPackagesService_UpdateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.UpdateInstalledPackageRequest + var protoReq v1alpha1_0.UpdateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -523,7 +523,7 @@ func request_HelmPackagesService_UpdateInstalledPackage_0(ctx context.Context, m } func local_request_HelmPackagesService_UpdateInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.UpdateInstalledPackageRequest + var protoReq v1alpha1_0.UpdateInstalledPackageRequest var metadata runtime.ServerMetadata newReader, berr := utilities.IOReaderFactory(req.Body) @@ -581,7 +581,7 @@ var ( ) func request_HelmPackagesService_DeleteInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.DeleteInstalledPackageRequest + var protoReq v1alpha1_0.DeleteInstalledPackageRequest var metadata runtime.ServerMetadata var ( @@ -634,7 +634,7 @@ func request_HelmPackagesService_DeleteInstalledPackage_0(ctx context.Context, m } func local_request_HelmPackagesService_DeleteInstalledPackage_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.DeleteInstalledPackageRequest + var protoReq v1alpha1_0.DeleteInstalledPackageRequest var metadata runtime.ServerMetadata var ( @@ -799,7 +799,7 @@ var ( ) func request_HelmPackagesService_GetInstalledPackageResourceRefs_0(ctx context.Context, marshaler runtime.Marshaler, client HelmPackagesServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetInstalledPackageResourceRefsRequest + var protoReq v1alpha1_0.GetInstalledPackageResourceRefsRequest var metadata runtime.ServerMetadata var ( @@ -852,7 +852,7 @@ func request_HelmPackagesService_GetInstalledPackageResourceRefs_0(ctx context.C } func local_request_HelmPackagesService_GetInstalledPackageResourceRefs_0(ctx context.Context, marshaler runtime.Marshaler, server HelmPackagesServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq v1alpha1_1.GetInstalledPackageResourceRefsRequest + var protoReq v1alpha1_0.GetInstalledPackageResourceRefsRequest var metadata runtime.ServerMetadata var ( diff --git a/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm_grpc.pb.go b/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm_grpc.pb.go index c081361b70a..61c8df4d6de 100644 --- a/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm_grpc.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1/helm_grpc.pb.go @@ -8,7 +8,7 @@ package v1alpha1 import ( context "context" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.go b/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.go index cd80f00fbda..d25ca34b274 100644 --- a/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.go @@ -11,8 +11,8 @@ package v1alpha1 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - v1alpha11 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha11 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -483,14 +483,14 @@ var file_kubeappsapis_plugins_kapp_controller_packages_v1alpha1_kapp_controller_ 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x2f, 0x7b, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x7d, 0x2f, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x72, 0x65, 0x66, 0x73, 0x42, 0x5e, 0x5a, 0x5c, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, - 0x70, 0x73, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, - 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, - 0x6e, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x6b, 0x61, 0x70, 0x70, 0x5f, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, - 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x72, 0x65, 0x66, 0x73, 0x42, 0x62, 0x5a, 0x60, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, + 0x2d, 0x74, 0x61, 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, + 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, + 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x6b, 0x61, + 0x70, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.gw.go b/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.gw.go index c34084c7623..a084a875b0c 100644 --- a/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.gw.go +++ b/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller.pb.gw.go @@ -15,7 +15,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" - v1alpha1_1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1_1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller_grpc.pb.go b/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller_grpc.pb.go index a18ddf86e51..546b885a4ed 100644 --- a/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller_grpc.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1/kapp_controller_grpc.pb.go @@ -8,7 +8,7 @@ package v1alpha1 import ( context "context" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1/resources.pb.go b/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1/resources.pb.go index 18ccc8bf4df..38b72906882 100644 --- a/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1/resources.pb.go +++ b/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1/resources.pb.go @@ -10,7 +10,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -1141,13 +1141,13 @@ var file_kubeappsapis_plugins_resources_v1alpha1_resources_proto_rawDesc = []byt 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x63, 0x2f, 0x7b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x7d, 0x2f, 0x6e, 0x73, 0x2f, 0x7b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, - 0x2f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, - 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x6b, 0x75, 0x62, - 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, - 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, - 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x2f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x42, 0x53, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x74, 0x61, + 0x6e, 0x7a, 0x75, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2f, 0x63, 0x6d, 0x64, + 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x61, 0x70, 0x70, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cmd/kubeapps-apis/main.go b/cmd/kubeapps-apis/main.go index d1fb0d4bf76..ffe9eaa6275 100644 --- a/cmd/kubeapps-apis/main.go +++ b/cmd/kubeapps-apis/main.go @@ -3,10 +3,10 @@ package main -import "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/cmd" +import "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/cmd" // This cobra command was initially generated together with the cmd/root with the command -// cobra init --pkg-name github.com/kubeapps/kubeapps/cmd/kubeapps-apis +// cobra init --pkg-name github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis func main() { cmd.Execute() diff --git a/cmd/kubeapps-apis/plugin_test/mock_plugin.go b/cmd/kubeapps-apis/plugin_test/mock_plugin.go index cd89808d6e4..200f9dd4502 100644 --- a/cmd/kubeapps-apis/plugin_test/mock_plugin.go +++ b/cmd/kubeapps-apis/plugin_test/mock_plugin.go @@ -6,8 +6,8 @@ package plugin_test import ( "context" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cmd/kubeapps-apis/plugin_test/utils.go b/cmd/kubeapps-apis/plugin_test/utils.go index e961097b7d7..3f9f65fb5e6 100644 --- a/cmd/kubeapps-apis/plugin_test/utils.go +++ b/cmd/kubeapps-apis/plugin_test/utils.go @@ -4,8 +4,8 @@ package plugin_test import ( - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" ) const ( diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/chart_cache.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/chart_cache.go index e87196eb70a..35263abfea0 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/chart_cache.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/chart_cache.go @@ -16,10 +16,10 @@ import ( "time" "github.com/go-redis/redis/v8" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/pkg/chart/models" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/types" @@ -148,7 +148,7 @@ func (c *ChartCache) SyncCharts(charts []models.Chart, clientOptions *common.Cli } // If the URL is relative (no scheme), prepend the chart repo's base URL - // ref https://github.com/kubeapps/kubeapps/issues/4381 + // ref https://github.com/vmware-tanzu/kubeapps/issues/4381 // ref https://github.com/helm/helm/blob/65d8e72504652e624948f74acbba71c51ac2e342/pkg/downloader/chart_downloader.go#L303 if !u.IsAbs() { repoURL, err := url.Parse(chart.Repo.URL) diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/watcher_cache.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/watcher_cache.go index e1d2cfdd343..044119a805c 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/watcher_cache.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache/watcher_cache.go @@ -14,8 +14,8 @@ import ( "time" "github.com/go-redis/redis/v8" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" apiv1 "k8s.io/api/core/v1" @@ -181,7 +181,7 @@ func NewNamespacedResourceWatcherCache(name string, config NamespacedResourceWat } } - // per https://github.com/kubeapps/kubeapps/issues/4329 + // per https://github.com/vmware-tanzu/kubeapps/issues/4329 // we want to do this asynchronously, so that having to parse existing large repos in the cluster // doesn't block the kubeapps apis pod start-up go c.syncAndStartWatchLoop(stopCh) @@ -431,7 +431,7 @@ func (c *NamespacedResourceWatcherCache) resync(bootstrap bool) (string, error) // This code runs in the background, i.e. not in a context of any specific user request. // As such, it requires RBAC to be set up properly during install to be able to list specified GVR - // (e.g. flux CRDs). For further details, see https://github.com/kubeapps/kubeapps/pull/3551 and + // (e.g. flux CRDs). For further details, see https://github.com/vmware-tanzu/kubeapps/pull/3551 and // see helm chart templates/kubeappsapis/rbac_fluxv2.yaml // Notice, we are not setting resourceVersion in ListOptions, which means diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart.go index 756e172752d..5522bfd58f0 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart.go @@ -11,12 +11,12 @@ import ( "strings" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/tarutil" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/tarutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/chart" @@ -110,7 +110,7 @@ func (s *Server) availableChartDetail(ctx context.Context, packageRef *corev1.Av pkgDetail.RepoUrl = repoUrl pkgDetail.AvailablePackageRef.Context.Namespace = packageRef.Context.Namespace - // per https://github.com/kubeapps/kubeapps/pull/3686#issue-1038093832 + // per https://github.com/vmware-tanzu/kubeapps/pull/3686#issue-1038093832 pkgDetail.AvailablePackageRef.Context.Cluster = s.kubeappsCluster return pkgDetail, nil } @@ -202,7 +202,7 @@ func filterAndPaginateCharts(filters *corev1.FilterOptions, pageSize int32, page // 1) to convert from []interface{} which is what the generic cache implementation // returns for cache hits to a typed array object. // 2) perform any filtering of the results as needed, pending redis support for - // querying values stored in cache (see discussion in https://github.com/kubeapps/kubeapps/issues/3032) + // querying values stored in cache (see discussion in https://github.com/vmware-tanzu/kubeapps/issues/3032) // 3) if pagination was requested, only return up to one page size of results summaries := make([]*corev1.AvailablePackageSummary, 0) i := 0 diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_integration_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_integration_test.go index 2fc288df359..be19ba9400a 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_integration_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_integration_test.go @@ -11,8 +11,8 @@ import ( "time" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" "golang.org/x/sync/semaphore" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -263,7 +263,7 @@ func TestKindClusterGetAvailablePackageSummariesForLargeReposAndTinyRedis(t *tes // a) with 3a) => should work 2 times // b) with 3b) => should fail 2 times with PermissionDenied error // c) with 3c) => should fail once and work once -// ref https://github.com/kubeapps/kubeapps/issues/4390 +// ref https://github.com/vmware-tanzu/kubeapps/issues/4390 func TestKindClusterRepoAndChartRBAC(t *testing.T) { fluxPluginClient, _, err := checkEnv(t) if err != nil { diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_test.go index c243002beb9..2e9d8f2346b 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/chart_test.go @@ -19,11 +19,11 @@ import ( redismock "github.com/go-redis/redismock/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/api/errors" @@ -840,7 +840,7 @@ func TestChartCacheResyncNotIdle(t *testing.T) { }) } -// ref https://github.com/kubeapps/kubeapps/issues/4381 +// ref https://github.com/vmware-tanzu/kubeapps/issues/4381 // [fluxv2] non-FQDN chart url fails on chart view #4381 func TestChartWithRelativeURL(t *testing.T) { repoName := "testRepo" diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils.go index fe9375dd56f..a52a0d7df2f 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils.go @@ -20,9 +20,9 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/go-redis/redis/v8" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "golang.org/x/net/http/httpproxy" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -143,7 +143,7 @@ func RWMutexReadLocked(rw *sync.RWMutex) bool { return reflect.ValueOf(rw).Elem().FieldByName("readerCount").Int() > 0 } -// https://github.com/kubeapps/kubeapps/pull/3044#discussion_r662733334 +// https://github.com/vmware-tanzu/kubeapps/pull/3044#discussion_r662733334 // small preference for reading all config in the main.go // (whether from env vars or cmd-line options) only in the one spot and passing // explicitly to functions (so functions are less dependent on env state). @@ -166,7 +166,7 @@ func NewRedisClientFromEnv(stopCh <-chan struct{}) (*redis.Client, error) { return nil, err } - // ref https://github.com/kubeapps/kubeapps/pull/4382#discussion_r820386531 + // ref https://github.com/vmware-tanzu/kubeapps/pull/4382#discussion_r820386531 var redisCli *redis.Client err = wait.PollImmediate(redisInitClientRetryWait, redisInitClientTimeout, func() (bool, error) { diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils_test.go index 0354ad0726e..67cc5daf336 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common/utils_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" "sigs.k8s.io/yaml" ) @@ -226,7 +226,7 @@ core: flux: packages: v1alpha1: - defaultUpgradePolicy: minor + defaultUpgradePolicy: minor `), exp_policy_str: "minor", exp_error_str: "", diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/global_vars_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/global_vars_test.go index 932c37deb8e..b3f9660cdaf 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/global_vars_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/global_vars_test.go @@ -10,14 +10,14 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" fluxmeta "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "helm.sh/helm/v3/pkg/release" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // global vars -// why define these here? see https://github.com/kubeapps/kubeapps/pull/3736#discussion_r745246398 +// why define these here? see https://github.com/vmware-tanzu/kubeapps/pull/3736#discussion_r745246398 // plus I am putting them in a separate file, since they take up so much space they distract from // overall test logic var ( diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/integration_utils_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/integration_utils_test.go index 1a215840d64..fba7acb009d 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/integration_utils_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/integration_utils_test.go @@ -22,12 +22,12 @@ import ( "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/go-redis/redis/v8" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - fluxplugin "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/helm" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + fluxplugin "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/helm" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "golang.org/x/sync/semaphore" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/main.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/main.go index 1bfe212979c..556cd00e215 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/main.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/main.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" log "k8s.io/klog/v2" ) diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go index a883c0221b8..7c58ccdc28b 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go @@ -13,13 +13,13 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" fluxmeta "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" - "github.com/kubeapps/kubeapps/pkg/chart/models" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" - "github.com/kubeapps/kubeapps/pkg/tarutil" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/pkg/tarutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/action" @@ -255,7 +255,7 @@ func (s *Server) installedPackageDetail(ctx context.Context, key types.Namespace if err != nil { return nil, err } - // per https://github.com/kubeapps/kubeapps/pull/3686#issue-1038093832 + // per https://github.com/vmware-tanzu/kubeapps/pull/3686#issue-1038093832 availablePackageRef.Context.Cluster = s.kubeappsCluster appVersion, postInstallNotes := "", "" @@ -356,7 +356,7 @@ func (s *Server) newRelease(ctx context.Context, packageRef *corev1.AvailablePac return nil, err } - // per https://github.com/kubeapps/kubeapps/pull/3640#issuecomment-949315105 + // per https://github.com/vmware-tanzu/kubeapps/pull/3640#issuecomment-949315105 // the helm release CR to also be created in the target namespace (where the helm // release itself is currently created) client, err := s.getClient(ctx, targetName.Namespace) @@ -487,7 +487,7 @@ func (s *Server) deleteRelease(ctx context.Context, packageRef *corev1.Installed // Potentially, there are 3 different namespaces that can be specified here // 1. spec.chart.spec.sourceRef.namespace, where HelmRepository CRD object referenced exists // 2. metadata.namespace, where this HelmRelease CRD will exist, same as (3) below -// per https://github.com/kubeapps/kubeapps/pull/3640#issuecomment-949315105 +// per https://github.com/vmware-tanzu/kubeapps/pull/3640#issuecomment-949315105 // 3. spec.targetNamespace, where flux will install any artifacts from the release func (s *Server) newFluxHelmRelease(chart *models.Chart, targetName types.NamespacedName, versionExpr string, reconcile *corev1.ReconciliationOptions, values map[string]interface{}) (*helmv2.HelmRelease, error) { fluxRelease := &helmv2.HelmRelease{ diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_integration_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_integration_test.go index 81c7a3c98f0..4a2a02866d4 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_integration_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_integration_test.go @@ -13,10 +13,10 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - fluxplugin "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + fluxplugin "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" rbacv1 "k8s.io/api/rbac/v1" @@ -513,7 +513,7 @@ func TestKindClusterDeleteInstalledPackage(t *testing.T) { // a) as 4a) returns all refs // b) as 4b) returns PermissionDenied error // c) as 4c) returns all refs -// ref https://github.com/kubeapps/kubeapps/issues/4390 +// ref https://github.com/vmware-tanzu/kubeapps/issues/4390 func TestKindClusterRBAC_ReadRelease(t *testing.T) { fluxPluginClient, _, err := checkEnv(t) if err != nil { @@ -1280,7 +1280,7 @@ func createAndWaitForHelmRelease(t *testing.T, tc integrationTestCreatePackageSp tc.request.TargetContext.Namespace += "-" + randSeq(4) if !tc.noPreCreateNs { - // per https://github.com/kubeapps/kubeapps/pull/3640#issuecomment-950383123 + // per https://github.com/vmware-tanzu/kubeapps/pull/3640#issuecomment-950383123 if err := kubeCreateNamespace(t, tc.request.TargetContext.Namespace); err != nil { t.Fatal(err) } diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_test.go index 6a4da84d7dd..e3d6416be57 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release_test.go @@ -18,11 +18,11 @@ import ( redismock "github.com/go-redis/redismock/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/action" @@ -177,7 +177,7 @@ func TestGetInstalledPackageSummariesWithoutPagination(t *testing.T) { }, }, { - // see https://github.com/kubeapps/kubeapps/issues/4189 for discussion + // see https://github.com/vmware-tanzu/kubeapps/issues/4189 for discussion // this is testing a configuration where a customer has manually set a // .targetNamespace field of Flux HelmRelease CR name: "returns installed packages when HelmRelease targetNamespace is set", @@ -451,7 +451,7 @@ func TestGetInstalledPackageDetail(t *testing.T) { expectedDetail: redis_detail_completed_with_values_and_reconciliation_options, }, { - // see https://github.com/kubeapps/kubeapps/issues/4189 for discussion + // see https://github.com/vmware-tanzu/kubeapps/issues/4189 for discussion // this is testing a configuration where a customer has manually set a // .targetNamespace field of Flux HelmRelease CR name: "returns installed package detail when targetNamespace is set", @@ -747,7 +747,7 @@ func TestUpdateInstalledPackage(t *testing.T) { expectedStatusCode: codes.NotFound, }, { - // see https://github.com/kubeapps/kubeapps/issues/4189 for discussion + // see https://github.com/vmware-tanzu/kubeapps/issues/4189 for discussion // this is testing a configuration where a customer has manually set a // .targetNamespace field of Flux HelmRelease CR name: "updates a package when targetNamespace is set", @@ -1051,14 +1051,14 @@ func TestGetInstalledPackageResourceRefs(t *testing.T) { newTestCase(3, true, codes.OK, false), newTestCase(4, false, codes.NotFound, false), newTestCase(5, false, codes.Internal, false), - // See https://github.com/kubeapps/kubeapps/issues/632 + // See https://github.com/vmware-tanzu/kubeapps/issues/632 newTestCase(6, true, codes.OK, false), newTestCase(7, true, codes.OK, false), newTestCase(8, true, codes.OK, false), // See https://kubernetes.io/docs/reference/kubernetes-api/authorization-resources/role-v1/#RoleList newTestCase(9, true, codes.OK, false), newTestCase(10, true, codes.OK, false), - // see https://github.com/kubeapps/kubeapps/issues/4189 for discussion + // see https://github.com/vmware-tanzu/kubeapps/issues/4189 for discussion // this is testing a configuration where a customer has manually set a // .targetNamespace field of Flux HelmRelease CR newTestCase(11, true, codes.OK, true), diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go index dd432114fe0..852fc1c1da2 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo.go @@ -16,14 +16,14 @@ import ( fluxmeta "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/helm" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/helm" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" apiv1 "k8s.io/api/core/v1" @@ -52,7 +52,7 @@ var ( func (s *Server) listReposInAllNamespaces(ctx context.Context) ([]sourcev1.HelmRepository, error) { // the actual List(...) call will be executed in the context of // kubeapps-internal-kubeappsapis service account - // ref https://github.com/kubeapps/kubeapps/issues/4390 for explanation + // ref https://github.com/vmware-tanzu/kubeapps/issues/4390 for explanation backgroundCtx := context.Background() client, err := s.serviceAccountClientGetter.ControllerRuntime(backgroundCtx) if err != nil { @@ -285,7 +285,7 @@ func (s *Server) newRepo(ctx context.Context, targetName types.NamespacedName, u // check that the secret has "username" and "password" fields, etc. // TODO (gfichtenholt) - // ref https://github.com/kubeapps/kubeapps/pull/4353#discussion_r816332595 + // ref https://github.com/vmware-tanzu/kubeapps/pull/4353#discussion_r816332595 // check whether flux supports typed secrets in addition to opaque secrets // https://kubernetes.io/docs/concepts/configuration/secret/#secret-types // If so, that cause certain validation to be done on the data (ie. ensuring that @@ -543,7 +543,7 @@ func (s *repoEventSink) indexAndEncode(checksum string, repo sourcev1.HelmReposi if s.chartCache != nil { if opts, err := s.clientOptionsForRepo(context.Background(), repo); err != nil { - // ref: https://github.com/kubeapps/kubeapps/pull/3899#issuecomment-990446931 + // ref: https://github.com/vmware-tanzu/kubeapps/pull/3899#issuecomment-990446931 // I don't want this func to fail onAdd/onModify() if we can't read // the corresponding secret due to something like default RBAC settings: // "secrets "podinfo-basic-auth-secret" is forbidden: @@ -709,7 +709,7 @@ func (s *repoEventSink) fromKey(key string) (*types.NamespacedName, error) { return &types.NamespacedName{Namespace: parts[1], Name: parts[2]}, nil } -// this is only until https://github.com/kubeapps/kubeapps/issues/3496 +// this is only until https://github.com/vmware-tanzu/kubeapps/issues/3496 // "Investigate and propose package repositories API with similar core interface to packages API" // gets implemented. After that, the auth should be part of some kind of packageRepositoryFromCtrlObject() // The reason I do this here is to set up auth that may be needed to fetch chart tarballs by diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_integration_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_integration_test.go index 9b08954afd7..5c8eae4abf4 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_integration_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" apiv1 "k8s.io/api/core/v1" diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_test.go index 9dfe0964371..e6d03aceb66 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/repo_test.go @@ -18,9 +18,9 @@ import ( redismock "github.com/go-redis/redismock/v8" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" authorizationv1 "k8s.io/api/authorization/v1" diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go index 315648c908f..a91b814f693 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go @@ -16,16 +16,16 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" log "k8s.io/klog/v2" @@ -185,7 +185,7 @@ func (s *Server) GetAvailablePackageSummaries(ctx context.Context, request *core return nil, err } - // per https://github.com/kubeapps/kubeapps/pull/3686#issue-1038093832 + // per https://github.com/vmware-tanzu/kubeapps/pull/3686#issue-1038093832 for _, summary := range packageSummaries { summary.AvailablePackageRef.Context.Cluster = s.kubeappsCluster } diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server_test.go index 306670083b9..b31f1a7d480 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server_test.go @@ -13,10 +13,10 @@ import ( fluxmeta "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" redismock "github.com/go-redis/redismock/v8" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/cache" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/common" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/action" diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/test_util_test.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/test_util_test.go index d82f3eab64d..c71b30543f7 100644 --- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/test_util_test.go +++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/test_util_test.go @@ -15,8 +15,8 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/google/go-cmp/cmp" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" apiv1 "k8s.io/api/core/v1" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apimeta "k8s.io/apimachinery/pkg/api/meta" diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/create_test.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/create_test.go index f903389a9a3..25503740a9b 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/create_test.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/create_test.go @@ -9,9 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/action" diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/delete_test.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/delete_test.go index e34d3c1130d..6eb7886771f 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/delete_test.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/delete_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/release" diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/getresourcerefs_test.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/getresourcerefs_test.go index bb840c27195..9a5b952e4b7 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/getresourcerefs_test.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/getresourcerefs_test.go @@ -9,9 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -68,7 +68,7 @@ func TestGetInstalledPackageResourceRefs(t *testing.T) { newTestCase(3, "my-apache", true, codes.OK), newTestCase(4, "my-iis", false, codes.NotFound), newTestCase(5, "my-apache", false, codes.Internal), - // See https://github.com/kubeapps/kubeapps/issues/632 + // See https://github.com/vmware-tanzu/kubeapps/issues/632 newTestCase(6, "my-apache", true, codes.OK), newTestCase(7, "my-apache", true, codes.OK), newTestCase(8, "my-apache", true, codes.OK), diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/main.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/main.go index 41f5afa1010..0b2b1ef123b 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/main.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/main.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - pluginsgrpcv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + pluginsgrpcv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" ) // Set the pluginDetail once during a module init function so the single struct diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/rollback_test.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/rollback_test.go index a89482deab3..1d35011a9b9 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/rollback_test.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/rollback_test.go @@ -9,10 +9,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - helmv1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + helmv1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/chart" diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server.go index fac8244f20c..1f6d10c75f1 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server.go @@ -14,20 +14,20 @@ import ( "path" "strings" - appRepov1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/assetsvc/pkg/utils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - helmv1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs" - "github.com/kubeapps/kubeapps/pkg/agent" - chartutils "github.com/kubeapps/kubeapps/pkg/chart" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" - "github.com/kubeapps/kubeapps/pkg/handlerutil" + appRepov1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/pkg/utils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + helmv1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs" + "github.com/vmware-tanzu/kubeapps/pkg/agent" + chartutils "github.com/vmware-tanzu/kubeapps/pkg/chart" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/handlerutil" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/anypb" diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server_test.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server_test.go index 4e886e75a4d..e5f7a377230 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server_test.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/server_test.go @@ -18,20 +18,20 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/assetsvc/pkg/utils" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - helmv1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/assetsvc/pkg/utils" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + helmv1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" "sigs.k8s.io/yaml" - "github.com/kubeapps/kubeapps/pkg/agent" - "github.com/kubeapps/kubeapps/pkg/chart/fake" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/agent" + "github.com/vmware-tanzu/kubeapps/pkg/chart/fake" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/anypb" diff --git a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/update_test.go b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/update_test.go index 79264eb2404..5c9d45e792f 100644 --- a/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/update_test.go +++ b/cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/update_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/chart" diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/main.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/main.go index 346e347b2c9..23adaa1b240 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/main.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/main.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - pluginsgrpcv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + pluginsgrpcv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" ) // Set the pluginDetail once during a module init function so the single struct diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server.go index 0c743885973..6f98e88d8f7 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server.go @@ -16,11 +16,11 @@ import ( kappcmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" "github.com/k14s/kapp/pkg/kapp/logger" ctlres "github.com/k14s/kapp/pkg/kapp/resources" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/client-go/dynamic" diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_packages.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_packages.go index cd27f69cf90..fefa1f25c33 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_packages.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_packages.go @@ -10,16 +10,16 @@ import ( "sync" "time" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/k8sutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" 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/k8sutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/paginate" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/api/errors" @@ -353,7 +353,7 @@ func (s *Server) GetInstalledPackageSummaries(ctx context.Context, request *core // i goroutine, the i-th stub will remain. Check if 'errgroup' works here, but I haven't // been able so far. // An alternative is using channels to perform a fine-grained control... but not sure if it worths - // However, should we just return an error if so? See https://github.com/kubeapps/kubeapps/pull/3784#discussion_r754836475 + // However, should we just return an error if so? See https://github.com/vmware-tanzu/kubeapps/pull/3784#discussion_r754836475 // filter out values installedPkgSummariesNilSafe := []*corev1.InstalledPackageSummary{} for _, installedPkgSummary := range installedPkgSummaries { @@ -692,7 +692,7 @@ func (s *Server) UpdateInstalledPackage(ctx context.Context, request *corev1.Upd } else { // Delete all the associated secrets // TODO(agamez): maybe it's too aggressive and we should be deleting only those secrets created by this plugin - // See https://github.com/kubeapps/kubeapps/pull/3790#discussion_r754797195 + // See https://github.com/vmware-tanzu/kubeapps/pull/3790#discussion_r754797195 for _, packageInstallValue := range pkgInstall.Spec.Values { secretId := packageInstallValue.SecretRef.Name err := typedClient.CoreV1().Secrets(packageNamespace).Delete(ctx, secretId, metav1.DeleteOptions{}) @@ -757,7 +757,7 @@ func (s *Server) DeleteInstalledPackage(ctx context.Context, request *corev1.Del // Delete all the associated secrets // TODO(agamez): maybe it's too aggressive and we should be deleting only those secrets created by this plugin - // See https://github.com/kubeapps/kubeapps/pull/3790#discussion_r754797195 + // See https://github.com/vmware-tanzu/kubeapps/pull/3790#discussion_r754797195 for _, packageInstallValue := range pkgInstall.Spec.Values { secretId := packageInstallValue.SecretRef.Name err := typedClient.CoreV1().Secrets(namespace).Delete(ctx, secretId, metav1.DeleteOptions{}) diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_repositories.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_repositories.go index a9a89ecdb92..52df34f7bd8 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_repositories.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_ctrl_repositories.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" log "k8s.io/klog/v2" ) 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 8763d611a32..18c2c47466b 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 @@ -8,9 +8,6 @@ import ( "strings" "time" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" kappctrlinstalled "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/installed" kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" @@ -18,6 +15,9 @@ import ( 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/gen/plugins/kapp_controller/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" k8scorev1 "k8s.io/api/core/v1" @@ -33,7 +33,7 @@ func (s *Server) buildAvailablePackageSummary(pkgMetadata *datapackagingv1alpha1 // TODO(agamez): check if want to avoid sending this data over the wire // instead we could send a url (to another API endpoint) to retrieve the icon - // See: https://github.com/kubeapps/kubeapps/pull/3787#discussion_r754741255 + // See: https://github.com/vmware-tanzu/kubeapps/pull/3787#discussion_r754741255 if pkgMetadata.Spec.IconSVGBase64 != "" { iconStringBuilder.WriteString("data:image/svg+xml;base64,") iconStringBuilder.WriteString(pkgMetadata.Spec.IconSVGBase64) @@ -71,7 +71,7 @@ func (s *Server) buildAvailablePackageDetail(pkgMetadata *datapackagingv1alpha1. // TODO(agamez): check if want to avoid sending this data over the wire // instead we could send a url (to another API endpoint) to retrieve the icon - // See: https://github.com/kubeapps/kubeapps/pull/3787#discussion_r754741255 + // See: https://github.com/vmware-tanzu/kubeapps/pull/3787#discussion_r754741255 var iconStringBuilder strings.Builder if pkgMetadata.Spec.IconSVGBase64 != "" { iconStringBuilder.WriteString("data:image/svg+xml;base64,") @@ -141,7 +141,7 @@ func (s *Server) buildInstalledPackageSummary(pkgInstall *packagingv1alpha1.Pack // TODO(agamez): check if want to avoid sending this data over the wire // instead we could send a url (to another API endpoint) to retrieve the icon - // See: https://github.com/kubeapps/kubeapps/pull/3787#discussion_r754741255 + // See: https://github.com/vmware-tanzu/kubeapps/pull/3787#discussion_r754741255 var iconStringBuilder strings.Builder if pkgMetadata.Spec.IconSVGBase64 != "" { iconStringBuilder.WriteString("data:image/svg+xml;base64,") @@ -346,7 +346,7 @@ func (s *Server) buildPkgInstall(installedPackageName, targetCluster, targetName // This is the Carvel's way of supporting deployments across clusters // without having kapp-controller on those other clusters // We, currently, don't support deploying to another cluster without kapp-controller - // See https://github.com/kubeapps/kubeapps/pull/3789#discussion_r754786633 + // See https://github.com/vmware-tanzu/kubeapps/pull/3789#discussion_r754786633 // Cluster: &kappctrlv1alpha1.AppCluster{ // Namespace: targetNamespace, // KubeconfigSecretRef: &kappctrlv1alpha1.AppClusterKubeconfigSecretRef{}, diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_resources.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_resources.go index b429142c87a..835ab72dc5d 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_resources.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_data_resources.go @@ -9,11 +9,11 @@ import ( "time" ctlres "github.com/k14s/kapp/pkg/kapp/resources" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/k8sutils" 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" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/k8sutils" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -241,7 +241,7 @@ func (s *Server) getPkgsWithFieldSelector(ctx context.Context, cluster, namespac listOptions.FieldSelector = fieldSelector } // TODO(agamez): this function takes way too long (1-2 seconds!). Try to reduce it - // More context at: https://github.com/kubeapps/kubeapps/pull/3784#discussion_r756259504 + // More context at: https://github.com/vmware-tanzu/kubeapps/pull/3784#discussion_r756259504 unstructured, err := resource.List(ctx, listOptions) if err != nil { return nil, err diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_test.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_test.go index e083343da31..b0619dd96f6 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_test.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_test.go @@ -22,16 +22,16 @@ import ( kappcmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" "github.com/k14s/kapp/pkg/kapp/logger" ctlres "github.com/k14s/kapp/pkg/kapp/resources" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - pluginv1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" 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" vendirversions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + pluginv1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" k8scorev1 "k8s.io/api/core/v1" diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils.go index e3d48bcd2d3..546d4b36a65 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils.go @@ -11,11 +11,11 @@ import ( "github.com/Masterminds/semver/v3" kappcmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/pkgutils" kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" datapackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" 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/pkgutils" "k8s.io/client-go/rest" ) diff --git a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils_test.go b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils_test.go index fd983a09533..e761f9623ed 100644 --- a/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils_test.go +++ b/cmd/kubeapps-apis/plugins/kapp_controller/packages/v1alpha1/server_utils_test.go @@ -11,10 +11,10 @@ import ( "github.com/Masterminds/semver/v3" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" datapackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" vendirversions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cmd/kubeapps-apis/plugins/pkg/clientgetter/clientgetter.go b/cmd/kubeapps-apis/plugins/pkg/clientgetter/clientgetter.go index 58de63eb85a..6aa2616332f 100644 --- a/cmd/kubeapps-apis/plugins/pkg/clientgetter/clientgetter.go +++ b/cmd/kubeapps-apis/plugins/pkg/clientgetter/clientgetter.go @@ -6,8 +6,8 @@ package clientgetter import ( "context" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - "github.com/kubeapps/kubeapps/pkg/agent" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + "github.com/vmware-tanzu/kubeapps/pkg/agent" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/action" @@ -123,7 +123,7 @@ func NewClientGetter(configGetter core.KubernetesConfigGetter, options Options) // returns an "out-of-band" or "in-cluster" client getter that returns various client interfaces // with the context of the current cluster it is executing on and the service account // configured for "kubeapps-apis" deployment -// https://github.com/kubeapps/kubeapps/issues/3560 +// https://github.com/vmware-tanzu/kubeapps/issues/3560 // flux plug-in runs out-of-request interactions with the Kubernetes API server. // Although we've already ensured that if the flux plugin is selected, that the service account // will be granted additional read privileges, we also need to ensure that the plugin can get a diff --git a/cmd/kubeapps-apis/plugins/pkg/k8sutils/k8sutils.go b/cmd/kubeapps-apis/plugins/pkg/k8sutils/k8sutils.go index a630ec784cf..09b0be048cc 100644 --- a/cmd/kubeapps-apis/plugins/pkg/k8sutils/k8sutils.go +++ b/cmd/kubeapps-apis/plugins/pkg/k8sutils/k8sutils.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/cmd/kubeapps-apis/plugins/pkg/paginate/paginate.go b/cmd/kubeapps-apis/plugins/pkg/paginate/paginate.go index 1728452fc93..e3d60e3fdf8 100644 --- a/cmd/kubeapps-apis/plugins/pkg/paginate/paginate.go +++ b/cmd/kubeapps-apis/plugins/pkg/paginate/paginate.go @@ -6,7 +6,7 @@ package paginate import ( "strconv" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cmd/kubeapps-apis/plugins/pkg/paginate/paginate_test.go b/cmd/kubeapps-apis/plugins/pkg/paginate/paginate_test.go index 56d818e8b40..6882b64fd54 100644 --- a/cmd/kubeapps-apis/plugins/pkg/paginate/paginate_test.go +++ b/cmd/kubeapps-apis/plugins/pkg/paginate/paginate_test.go @@ -6,7 +6,7 @@ package paginate import ( "testing" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils.go b/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils.go index 81e0507e008..128ce8d82ad 100644 --- a/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils.go +++ b/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils.go @@ -14,12 +14,12 @@ import ( "strings" "github.com/Masterminds/semver/v3" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/chart/models" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "gopkg.in/yaml.v3" // The usual "sigs.k8s.io/yaml" doesn't work: https://github.com/kubeapps/kubeapps/pull/4050 + "gopkg.in/yaml.v3" // The usual "sigs.k8s.io/yaml" doesn't work: https://github.com/vmware-tanzu/kubeapps/pull/4050 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema" "k8s.io/apimachinery/pkg/runtime" @@ -179,7 +179,7 @@ func AvailablePackageSummaryFromChart(chart *models.Chart, plugin *plugins.Plugi // I did consider using flux's implementation of AvailablePackageDetailFromChart but did not feel comfortable // chaning helm plugin to use it before talking to @minelson // Update Michael replied he is okay with my proposal: -// https://github.com/kubeapps/kubeapps/pull/4094#discussion_r790349962. +// https://github.com/vmware-tanzu/kubeapps/pull/4094#discussion_r790349962. // Will come back to this // GetUnescapedChartID takes a chart id with URI-encoded characters and decode them. Ex: 'foo%2Fbar' becomes 'foo/bar' diff --git a/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils_test.go b/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils_test.go index afa9abc8255..46b4b755b13 100644 --- a/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils_test.go +++ b/cmd/kubeapps-apis/plugins/pkg/pkgutils/pkgutils_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - plugins "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/chart/models" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + plugins "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/chart" diff --git a/cmd/kubeapps-apis/plugins/pkg/pkgutils/upgrade_policy.go b/cmd/kubeapps-apis/plugins/pkg/pkgutils/upgrade_policy.go index b8991468d46..21dc95f5748 100644 --- a/cmd/kubeapps-apis/plugins/pkg/pkgutils/upgrade_policy.go +++ b/cmd/kubeapps-apis/plugins/pkg/pkgutils/upgrade_policy.go @@ -54,7 +54,7 @@ func VersionConstraintWithUpgradePolicy(pkgVersion string, policy UpgradePolicy) // "Invalid Semantic Version", but .NewConstraint() will work fine if _, err2 := semver.NewConstraint(pkgVersion); err2 == nil { // this is a constraint-based semver expression - // per https://github.com/kubeapps/kubeapps/issues/4424#issuecomment-1068776980 + // per https://github.com/vmware-tanzu/kubeapps/issues/4424#issuecomment-1068776980 // return as is, ignoring the upgrade policy return pkgVersion, nil } else { diff --git a/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs.go b/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs.go index 5d0e140bf10..2f96bc9968c 100644 --- a/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs.go +++ b/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs.go @@ -9,8 +9,8 @@ import ( "io" "strings" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/clientgetter" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "helm.sh/helm/v3/pkg/action" @@ -104,7 +104,7 @@ func GetInstalledPackageResourceRefs( // certain assumptions about the RBAC of the Kubeapps user, we may be able // to instead query for labelled resources. See the discussion following for // more details: - // https://github.com/kubeapps/kubeapps/pull/3811#issuecomment-977689570 + // https://github.com/vmware-tanzu/kubeapps/pull/3811#issuecomment-977689570 getcmd := action.NewGet(actionConfig) release, err := getcmd.Run(helmReleaseName.Name) if err != nil { diff --git a/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs_test.go b/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs_test.go index 1851655ea20..74b75a0c9bf 100644 --- a/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs_test.go +++ b/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefs_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest/testsetup.go b/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest/testsetup.go index 39fd66dc747..6db5d2b7f35 100644 --- a/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest/testsetup.go +++ b/cmd/kubeapps-apis/plugins/pkg/resourcerefs/resourcerefstest/testsetup.go @@ -4,7 +4,7 @@ package resourcerefstest import ( - corev1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + corev1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" "google.golang.org/grpc/codes" ) @@ -190,7 +190,7 @@ should not be :! parsed as yaml$ }, { Name: "handles duplicate labels as helm does", - // See https://github.com/kubeapps/kubeapps/issues/632 + // See https://github.com/vmware-tanzu/kubeapps/issues/632 ExistingReleases: []TestReleaseStub{ { Name: "my-apache", @@ -518,7 +518,7 @@ should not be :! parsed as yaml$ }, { Name: "handles duplicate labels in the manifest as helm does (2)", - // See https://github.com/kubeapps/kubeapps/issues/632 + // See https://github.com/vmware-tanzu/kubeapps/issues/632 ExistingReleases: []TestReleaseStub{ { Name: releaseName, diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/main.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/main.go index 4c93d424024..6b57a2ed63b 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/main.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/main.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - pluginsgrpcv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + pluginsgrpcv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" ) // Set the pluginDetail once during a module init function so the single struct diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces.go index 37a6eb190eb..f052ebe61c5 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces.go @@ -6,8 +6,8 @@ package main import ( "context" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" core "k8s.io/api/core/v1" diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces_test.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces_test.go index 70935d30607..b234039fb56 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces_test.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/namespaces_test.go @@ -10,8 +10,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - pkgsGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + pkgsGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" core "k8s.io/api/core/v1" diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets.go index fcfd4283868..0b604a5b536 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets.go @@ -6,8 +6,8 @@ package main import ( "context" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" core "k8s.io/api/core/v1" diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets_test.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets_test.go index 957439e90ee..ae825de6d4c 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets_test.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/secrets_test.go @@ -10,8 +10,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - pkgsGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + pkgsGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" core "k8s.io/api/core/v1" diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/server.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/server.go index 442dbe8ad87..cf3d6f8da45 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/server.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/server.go @@ -26,11 +26,11 @@ import ( "k8s.io/client-go/restmapper" log "k8s.io/klog/v2" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - pkgsGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/scheme" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + pkgsGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugins/pkg/statuserror" ) type clientGetter func(context.Context, string) (kubernetes.Interface, dynamic.Interface, error) diff --git a/cmd/kubeapps-apis/plugins/resources/v1alpha1/server_test.go b/cmd/kubeapps-apis/plugins/resources/v1alpha1/server_test.go index ea9ffed6c3f..7873268ea87 100644 --- a/cmd/kubeapps-apis/plugins/resources/v1alpha1/server_test.go +++ b/cmd/kubeapps-apis/plugins/resources/v1alpha1/server_test.go @@ -31,10 +31,10 @@ import ( "k8s.io/client-go/kubernetes" typfake "k8s.io/client-go/kubernetes/fake" - pkgsGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - pluginsGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/plugin_test" + pkgsGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + pluginsGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/plugin_test" ) const bufSize = 1024 * 1024 diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/apidocs/v1alpha1/apidocs.proto b/cmd/kubeapps-apis/proto/kubeappsapis/apidocs/v1alpha1/apidocs.proto index f451b38fafd..b7d5a144bf1 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/apidocs/v1alpha1/apidocs.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/apidocs/v1alpha1/apidocs.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.apidocs.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen"; import "protoc-gen-openapiv2/options/annotations.proto"; @@ -17,8 +17,8 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Kubeapps API"; version: "0.1.0"; - description: "[![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/main.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/main)\n \n [Kubeapps](https://github.com/kubeapps/kubeapps) is a web-based UI for deploying and managing applications in Kubernetes clusters.\n \n Note: this API documentation is still in an initial stage and is subject to change. Before coupling to it, please [drop us an issue](https://github.com/kubeapps/kubeapps/issues/new/choose) or reach us [via Slack](https://kubernetes.slack.com/messages/kubeapps) to know more about your use case and see how we can assist you.\n #### Developer Documentation\n - The [Kubeapps architecture overview](https://github.com/kubeapps/kubeapps/blob/main/docs/background/architecture.md).\n - The [Kubeapps Developer Documentation](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/developer/README.md) for instructions on setting up the developer environment for developing on Kubeapps and its components.\n - The [Kubeapps Build Guide](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/developer/build.md) for instructions on setting up the build environment and building Kubeapps from source.\n"; - terms_of_service: "https://github.com/kubeapps/kubeapps/blob/main/LICENSE"; + description: "[![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/main.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/main)\n \n [Kubeapps](https://github.com/vmware-tanzu/kubeapps) is a web-based UI for deploying and managing applications in Kubernetes clusters.\n \n Note: this API documentation is still in an initial stage and is subject to change. Before coupling to it, please [drop us an issue](https://github.com/vmware-tanzu/kubeapps/issues/new/choose) or reach us [via Slack](https://kubernetes.slack.com/messages/kubeapps) to know more about your use case and see how we can assist you.\n #### Developer Documentation\n - The [Kubeapps architecture overview](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/background/architecture.md).\n - The [Kubeapps Developer Documentation](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/developer/README.md) for instructions on setting up the developer environment for developing on Kubeapps and its components.\n - The [Kubeapps Build Guide](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/developer/build.md) for instructions on setting up the build environment and building Kubeapps from source.\n"; + terms_of_service: "https://github.com/vmware-tanzu/kubeapps/blob/main/LICENSE"; license: { name: "Apache-2.0"; url: "http://www.apache.org/licenses/LICENSE-2.0.html"; @@ -26,7 +26,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { }; external_docs: { description: "Kuebapps GitHub repository"; - url: "https://github.com/kubeapps/kubeapps"; + url: "https://github.com/vmware-tanzu/kubeapps"; } schemes: HTTP; schemes: HTTPS; diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/packages.proto b/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/packages.proto index 0c4c752095d..6abc6e30a26 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/packages.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/packages.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.core.packages.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/repositories.proto b/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/repositories.proto index c87b30b7838..54122319b4a 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/repositories.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/core/packages/v1alpha1/repositories.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.core.packages.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; @@ -46,7 +46,7 @@ service RepositoriesService { // // Request for AddPackageRepository message AddPackageRepositoryRequest { - // The target context where the package repository is intended to be + // The target context where the package repository is intended to be // installed. Context context = 1; @@ -60,14 +60,14 @@ message AddPackageRepositoryRequest { // By default, the value is false, i.e. the repository is global bool namespace_scoped = 4; - // Package storage type - // In general, each plug-in will define an acceptable set of valid types + // Package storage type + // In general, each plug-in will define an acceptable set of valid types // - for direct helm plug-in valid values are: helm, oci // - for flux plug-in currently only supported value is helm. In the - // future, we may add support for git and/or AWS s3-style buckets + // future, we may add support for git and/or AWS s3-style buckets string type = 5; - // A URL identifying the package repository location. Must contain at + // A URL identifying the package repository location. Must contain at // least a protocol and host string url = 6; @@ -75,10 +75,10 @@ message AddPackageRepositoryRequest { // Optional. Defaults to 10m if not specified uint32 interval = 7; - // TLS-specific parameters for connecting to a repository. Optional + // TLS-specific parameters for connecting to a repository. Optional PackageRepositoryTlsConfig tls_config = 8; - // authentication parameters for connecting to a repository. Optional + // authentication parameters for connecting to a repository. Optional PackageRepositoryAuth auth = 9; // The plugin used to interact with this package repository. @@ -87,19 +87,19 @@ message AddPackageRepositoryRequest { kubeappsapis.core.plugins.v1alpha1.Plugin plugin = 10; // Custom data added by the plugin - // A plugin can define custom details for data which is not yet, or - // never will be specified in the core AddPackageRepositoryRequest + // A plugin can define custom details for data which is not yet, or + // never will be specified in the core AddPackageRepositoryRequest // fields. The use of an `Any` field means that each plugin can define - // the structure of this message as required, while still satisfying the - // core interface. + // the structure of this message as required, while still satisfying the + // core interface. // See https://developers.google.com/protocol-buffers/docs/proto3#any - // Just for reference, some of the examples that have been chosen not to + // Just for reference, some of the examples that have been chosen not to // be part of the core API but rather plugin-specific details are: // direct-helm: // - image pull secrets // - list of oci repositories // - filter rules - // - sync job pod template + // - sync job pod template google.protobuf.Any custom_detail = 11; } @@ -127,19 +127,19 @@ message PackageRepositoryTlsConfig { // There are 6 total distinct use cases we may support: // 1) None (Public) // 2) Basic Auth -// 3) Bearer Token +// 3) Bearer Token // 4) Custom Authorization Header // 5) Docker Registry Credentials (for OCI only) // 6) TLS certificate and key -// -// Note that (1)-(4) may be done over HTTP or HTTPs without any custom -// certificates or certificate authority +// +// Note that (1)-(4) may be done over HTTP or HTTPs without any custom +// certificates or certificate authority // (1) is handled by not not having PackageRepositoryAuth field on // the parent object -// a given plug-in may or may not support a given authentication type. +// a given plug-in may or may not support a given authentication type. // For example // - direct-helm plug-in does not currently support (6), while flux does -// - flux plug-in does not support (3) or (4) while direct-helm does +// - flux plug-in does not support (3) or (4) while direct-helm does message PackageRepositoryAuth { enum PackageRepositoryAuthType { PACKAGE_REPOSITORY_AUTH_TYPE_UNSPECIFIED = 0; @@ -150,11 +150,11 @@ message PackageRepositoryAuth { PACKAGE_REPOSITORY_AUTH_TYPE_DOCKER_CONFIG_JSON = 5; } PackageRepositoryAuthType type = 1; - + oneof package_repo_auth_one_of { // username and plain text password UsernamePassword username_password = 2; - + // certificate and key for TLS-based authentication TlsCertKey tls_cert_key = 3; @@ -163,7 +163,7 @@ message PackageRepositoryAuth { // for Bearer Auth token value // for Custom Auth, complete value of "Authorization" header - string header = 5; + string header = 5; // a reference to an existing secret SecretKeyReference secret_ref = 6; @@ -212,20 +212,20 @@ message DockerCredentials { // SecretKeyReference // message SecretKeyReference { - // The name of an existing secret in the same namespace as the object - // that refers to it (e.g. PackageRepository), containing authentication + // The name of an existing secret in the same namespace as the object + // that refers to it (e.g. PackageRepository), containing authentication // credentials for the said package repository. - // - For HTTP/S basic auth the secret must be of type + // - For HTTP/S basic auth the secret must be of type // "kubernetes.io/basic-auth" or opaque and contain username and // password fields - // - For TLS the secret must be of type "kubernetes.io/tls" or opaque + // - For TLS the secret must be of type "kubernetes.io/tls" or opaque // and contain a certFile and keyFile, and/or // caCert fields. - // - For Bearer or Custom Auth, the secret must be opaque, and + // - For Bearer or Custom Auth, the secret must be opaque, and // the key must be provided // - For Docker Registry Credentials (OCI registries) the secret // must of of type "kubernetes.io/dockerconfigjson” - // For more details, refer to + // For more details, refer to // https://kubernetes.io/docs/concepts/configuration/secret/ string name = 1; @@ -253,11 +253,11 @@ message GetPackageRepositorySummariesRequest { // PackageRepositoryReference // // A PackageRepositoryReference has the minimum information required to -// uniquely identify a package repository. +// uniquely identify a package repository. message PackageRepositoryReference { // The context (cluster/namespace) for the repository. Context context = 1; - + // The fully qualified identifier for the repository // (i.e. a unique name for the context). string identifier = 2; @@ -315,7 +315,7 @@ message PackageRepositoryStatus { message PackageRepositoryDetail { // A reference uniquely identifying the package repository. PackageRepositoryReference package_repo_ref = 1; - + // A user-provided name for the package repository (e.g. bitnami) string name = 2; @@ -324,8 +324,8 @@ message PackageRepositoryDetail { // Whether this repository is global or namespace-scoped. bool namespace_scoped = 4; - - // Package storage type + + // Package storage type string type = 5; // A URL identifying the package repository location. @@ -334,19 +334,19 @@ message PackageRepositoryDetail { // The interval at which to check the upstream for updates (in seconds) uint32 interval = 7; - // TLS-specific parameters for connecting to a repository. - // If the cert authority was configured for this repository, then in the context - // of GetPackageRepositoryDetail() operation, the PackageRepositoryTlsConfig will ALWAYS + // TLS-specific parameters for connecting to a repository. + // If the cert authority was configured for this repository, then in the context + // of GetPackageRepositoryDetail() operation, the PackageRepositoryTlsConfig will ALWAYS // contain an existing SecretKeyReference, rather that cert_authority field PackageRepositoryTlsConfig tls_config = 8; // authentication parameters for connecting to a repository. // If Basic Auth or TLS or Docker Creds Auth was configured for this repository, - // then in the context of GetPackageRepositoryDetail() operation, the - // PackageRepositoryAuth will ALWAYS contain an existing SecretKeyReference, + // then in the context of GetPackageRepositoryDetail() operation, the + // PackageRepositoryAuth will ALWAYS contain an existing SecretKeyReference, // rather that string values that may have been used when package repository was created // field - PackageRepositoryAuth auth = 9; + PackageRepositoryAuth auth = 9; // Custom data added by the plugin google.protobuf.Any custom_detail = 10; @@ -369,7 +369,7 @@ message GetPackageRepositoryDetailResponse { message PackageRepositorySummary { // A reference uniquely identifying the package repository. PackageRepositoryReference package_repo_ref = 1; - + // A user-provided name for the package repository (e.g. bitnami) string name = 2; @@ -378,8 +378,8 @@ message PackageRepositorySummary { // Whether this repository is global or namespace-scoped. bool namespace_scoped = 4; - - // Package storage type + + // Package storage type string type = 5; // URL identifying the package repository location. @@ -396,4 +396,4 @@ message PackageRepositorySummary { message GetPackageRepositorySummariesResponse { // List of PackageRepositorySummary repeated PackageRepositorySummary package_repository_summaries = 1; -} \ No newline at end of file +} diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/core/plugins/v1alpha1/plugins.proto b/cmd/kubeapps-apis/proto/kubeappsapis/core/plugins/v1alpha1/plugins.proto index 9bc546ffd54..6f1c3829c2b 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/core/plugins/v1alpha1/plugins.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/core/plugins/v1alpha1/plugins.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.core.plugins.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1"; import "google/api/annotations.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; @@ -37,7 +37,7 @@ message GetConfiguredPluginsResponse { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = { example: '{"plugins": [{"name": "kapp_controller.packages", "version": "v1alpha1"}]}' }; - + // Plugins // // List of Plugin @@ -56,7 +56,7 @@ message Plugin { // // The name of the plugin, such as `fluxv2.packages` or `kapp_controller.packages`. string name = 1; - + // Plugin version // // The version of the plugin, such as v1alpha1 diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.proto b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.proto index 01824da5bd2..c7c6e5b4c70 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.plugins.fluxv2.packages.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/fluxv2/packages/v1alpha1"; import "google/api/annotations.proto"; import "kubeappsapis/core/packages/v1alpha1/packages.proto"; diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/helm/packages/v1alpha1/helm.proto b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/helm/packages/v1alpha1/helm.proto index eb7a57d7576..fab22def741 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/helm/packages/v1alpha1/helm.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/helm/packages/v1alpha1/helm.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.plugins.helm.packages.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/helm/packages/v1alpha1"; import "google/api/annotations.proto"; import "kubeappsapis/core/packages/v1alpha1/packages.proto"; diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.proto b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.proto index 23f327670d1..9c5c139badf 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.plugins.kapp_controller.packages.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/kapp_controller/packages/v1alpha1"; import "google/api/annotations.proto"; import "kubeappsapis/core/packages/v1alpha1/packages.proto"; diff --git a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/resources/v1alpha1/resources.proto b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/resources/v1alpha1/resources.proto index 0dfdafd3efc..a37a9e174e8 100644 --- a/cmd/kubeapps-apis/proto/kubeappsapis/plugins/resources/v1alpha1/resources.proto +++ b/cmd/kubeapps-apis/proto/kubeappsapis/plugins/resources/v1alpha1/resources.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package kubeappsapis.plugins.resources.v1alpha1; -option go_package = "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1"; +option go_package = "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/plugins/resources/v1alpha1"; import "kubeappsapis/core/packages/v1alpha1/packages.proto"; diff --git a/cmd/kubeapps-apis/server/server.go b/cmd/kubeapps-apis/server/server.go index 038bfac8e65..7a33c3693b2 100644 --- a/cmd/kubeapps-apis/server/server.go +++ b/cmd/kubeapps-apis/server/server.go @@ -16,11 +16,11 @@ import ( "github.com/soheilhy/cmux" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" - "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core" - packagesv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/packages/v1alpha1" - pluginsv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" - packagesGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" - pluginsGRPCv1alpha1 "github.com/kubeapps/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" + "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core" + packagesv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/packages/v1alpha1" + pluginsv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/core/plugins/v1alpha1" + packagesGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/packages/v1alpha1" + pluginsGRPCv1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/kubeapps-apis/gen/core/plugins/v1alpha1" "google.golang.org/grpc" "google.golang.org/grpc/reflection" "google.golang.org/grpc/status" diff --git a/cmd/kubeops/Dockerfile b/cmd/kubeops/Dockerfile index 0b80dccce1d..c776e61e86f 100644 --- a/cmd/kubeops/Dockerfile +++ b/cmd/kubeops/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM bitnami/golang:1.18.0 as builder -WORKDIR /go/src/github.com/kubeapps/kubeapps +WORKDIR /go/src/github.com/vmware-tanzu/kubeapps COPY go.mod go.sum ./ COPY pkg pkg COPY cmd cmd @@ -13,12 +13,12 @@ ARG VERSION # https://github.com/golang/go/issues/27719#issuecomment-514747274 RUN --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache/go-build \ - CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/kubeapps/kubeapps/cmd/kubeops/cmd.version=$VERSION" ./cmd/kubeops + CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X github.com/vmware-tanzu/kubeapps/cmd/kubeops/cmd.version=$VERSION" ./cmd/kubeops FROM scratch COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo -COPY --from=builder /go/src/github.com/kubeapps/kubeapps/kubeops /kubeops +COPY --from=builder /go/src/github.com/vmware-tanzu/kubeapps/kubeops /kubeops EXPOSE 8080 USER 1001 CMD ["/kubeops"] diff --git a/cmd/kubeops/cmd/root.go b/cmd/kubeops/cmd/root.go index 5e2d57c9edc..2f14c3cb118 100644 --- a/cmd/kubeops/cmd/root.go +++ b/cmd/kubeops/cmd/root.go @@ -6,10 +6,10 @@ package cmd import ( "fmt" - "github.com/kubeapps/kubeapps/cmd/kubeops/server" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/vmware-tanzu/kubeapps/cmd/kubeops/server" log "k8s.io/klog/v2" ) diff --git a/cmd/kubeops/cmd/root_test.go b/cmd/kubeops/cmd/root_test.go index c5df4e79934..13c802a25f5 100644 --- a/cmd/kubeops/cmd/root_test.go +++ b/cmd/kubeops/cmd/root_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/cmd/kubeops/server" + "github.com/vmware-tanzu/kubeapps/cmd/kubeops/server" ) func TestParseFlagsCorrect(t *testing.T) { diff --git a/cmd/kubeops/internal/handler/handler.go b/cmd/kubeops/internal/handler/handler.go index 6f8429c4c01..01a011c71d0 100644 --- a/cmd/kubeops/internal/handler/handler.go +++ b/cmd/kubeops/internal/handler/handler.go @@ -10,14 +10,14 @@ import ( "strconv" "github.com/gorilla/mux" - "github.com/kubeapps/kubeapps/pkg/agent" - "github.com/kubeapps/kubeapps/pkg/auth" - "github.com/kubeapps/kubeapps/pkg/chart" - chartUtils "github.com/kubeapps/kubeapps/pkg/chart" - "github.com/kubeapps/kubeapps/pkg/handlerutil" - "github.com/kubeapps/kubeapps/pkg/kube" - "github.com/kubeapps/kubeapps/pkg/response" negroni "github.com/urfave/negroni/v2" + "github.com/vmware-tanzu/kubeapps/pkg/agent" + "github.com/vmware-tanzu/kubeapps/pkg/auth" + "github.com/vmware-tanzu/kubeapps/pkg/chart" + chartUtils "github.com/vmware-tanzu/kubeapps/pkg/chart" + "github.com/vmware-tanzu/kubeapps/pkg/handlerutil" + "github.com/vmware-tanzu/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/pkg/response" "helm.sh/helm/v3/pkg/action" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" diff --git a/cmd/kubeops/internal/handler/handler_test.go b/cmd/kubeops/internal/handler/handler_test.go index 430aca40ae3..132138be7ca 100644 --- a/cmd/kubeops/internal/handler/handler_test.go +++ b/cmd/kubeops/internal/handler/handler_test.go @@ -16,9 +16,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - fakeChartUtils "github.com/kubeapps/kubeapps/pkg/chart/fake" - kubeappsKube "github.com/kubeapps/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + fakeChartUtils "github.com/vmware-tanzu/kubeapps/pkg/chart/fake" + kubeappsKube "github.com/vmware-tanzu/kubeapps/pkg/kube" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" @@ -69,7 +69,7 @@ func newConfigFixture(t *testing.T, k *kubefake.FailingKubeClient) *Config { } } -// See https://github.com/kubeapps/kubeapps/pull/1439/files#r365678777 +// See https://github.com/vmware-tanzu/kubeapps/pull/1439/files#r365678777 // for discussion about cleaner long booleans. func and(exps ...bool) bool { for _, exp := range exps { diff --git a/cmd/kubeops/main.go b/cmd/kubeops/main.go index 4d1bf00fe11..2c83c059c78 100644 --- a/cmd/kubeops/main.go +++ b/cmd/kubeops/main.go @@ -3,10 +3,10 @@ package main -import "github.com/kubeapps/kubeapps/cmd/kubeops/cmd" +import "github.com/vmware-tanzu/kubeapps/cmd/kubeops/cmd" // This cobra command was initially generated together with the cmd/root with the command -// cobra init --pkg-name github.com/kubeapps/kubeapps/cmd/kubeops +// cobra init --pkg-name github.com/vmware-tanzu/kubeapps/cmd/kubeops func main() { cmd.Execute() diff --git a/cmd/kubeops/server/server.go b/cmd/kubeops/server/server.go index c52a03fb5da..d0252bc4593 100644 --- a/cmd/kubeops/server/server.go +++ b/cmd/kubeops/server/server.go @@ -16,12 +16,12 @@ import ( "github.com/gorilla/mux" "github.com/heptiolabs/healthcheck" - "github.com/kubeapps/kubeapps/cmd/kubeops/internal/handler" - "github.com/kubeapps/kubeapps/pkg/agent" - "github.com/kubeapps/kubeapps/pkg/auth" - backendHandlers "github.com/kubeapps/kubeapps/pkg/http-handler" - "github.com/kubeapps/kubeapps/pkg/kube" negroni "github.com/urfave/negroni/v2" + "github.com/vmware-tanzu/kubeapps/cmd/kubeops/internal/handler" + "github.com/vmware-tanzu/kubeapps/pkg/agent" + "github.com/vmware-tanzu/kubeapps/pkg/auth" + backendHandlers "github.com/vmware-tanzu/kubeapps/pkg/http-handler" + "github.com/vmware-tanzu/kubeapps/pkg/kube" log "k8s.io/klog/v2" ) diff --git a/cmd/pinniped-proxy/src/service.rs b/cmd/pinniped-proxy/src/service.rs index 1c10c50e2ec..0f7a9b15691 100644 --- a/cmd/pinniped-proxy/src/service.rs +++ b/cmd/pinniped-proxy/src/service.rs @@ -97,7 +97,7 @@ pub async fn proxy( Ok(r) => { info!("{}", logging::response_log_data(&r, log_data)); if r.status() == StatusCode::SWITCHING_PROTOCOLS { - // TODO(agamez): implement ws proxing here; see https://github.com/kubeapps/kubeapps/issues/2328 + // TODO(agamez): implement ws proxing here; see https://github.com/vmware-tanzu/kubeapps/issues/2328 Ok(Response::builder() .status(StatusCode::NOT_IMPLEMENTED) .body(Body::from("pinniped-proxy does not support websockets yet")) diff --git a/dashboard/public/index.html b/dashboard/public/index.html index 074424ac704..99e4f87797c 100644 --- a/dashboard/public/index.html +++ b/dashboard/public/index.html @@ -6,7 +6,7 @@ - +
diff --git a/dashboard/public/openapi.yaml b/dashboard/public/openapi.yaml index d2095954b98..ede302705c7 100644 --- a/dashboard/public/openapi.yaml +++ b/dashboard/public/openapi.yaml @@ -22,23 +22,23 @@ info: description: | [![CircleCI](https://circleci.com/gh/kubeapps/kubeapps/tree/main.svg?style=svg)](https://circleci.com/gh/kubeapps/kubeapps/tree/main) - [Kubeapps](https://github.com/kubeapps/kubeapps) is a web-based UI for deploying and managing applications in Kubernetes clusters. + [Kubeapps](https://github.com/vmware-tanzu/kubeapps) is a web-based UI for deploying and managing applications in Kubernetes clusters. - Note: this API documentation is still in an initial stage and is subject to change. Before coupling to it, please [drop us an issue](https://github.com/kubeapps/kubeapps/issues/new/choose) or reach us [via Slack](https://kubernetes.slack.com/messages/kubeapps) to know more about your use case and see how we can assist you. + Note: this API documentation is still in an initial stage and is subject to change. Before coupling to it, please [drop us an issue](https://github.com/vmware-tanzu/kubeapps/issues/new/choose) or reach us [via Slack](https://kubernetes.slack.com/messages/kubeapps) to know more about your use case and see how we can assist you. #### Developer Documentation - - The [Kubeapps architecture overview](https://github.com/kubeapps/kubeapps/blob/main/docs/background/architecture.md). - - The [Kubeapps Developer Documentation](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/developer/README.md) for instructions on setting up the developer environment for developing on Kubeapps and its components. - - The [Kubeapps Build Guide](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/developer/build.md) for instructions on setting up the build environment and building Kubeapps from source. + - The [Kubeapps architecture overview](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/background/architecture.md). + - The [Kubeapps Developer Documentation](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/developer/README.md) for instructions on setting up the developer environment for developing on Kubeapps and its components. + - The [Kubeapps Build Guide](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/developer/build.md) for instructions on setting up the build environment and building Kubeapps from source. version: 0.1.0 title: Kubeapps API - termsOfService: "https://github.com/kubeapps/kubeapps/blob/main/LICENSE" + termsOfService: "https://github.com/vmware-tanzu/kubeapps/blob/main/LICENSE" license: name: Apache-2.0 url: "http://www.apache.org/licenses/LICENSE-2.0.html" tags: - name: kubeops externalDocs: - url: "https://github.com/kubeapps/kubeapps/tree/main/cmd/kubeops" + url: "https://github.com/vmware-tanzu/kubeapps/tree/main/cmd/kubeops" description: "The kubeops component is a micro-service that creates an API endpoint for accessing the Helm API and Kubernetes resources." - name: PluginsService - name: PackagesService @@ -48,7 +48,7 @@ tags: - name: ResourcesService externalDocs: description: Kubeapps GitHub repository - url: "https://github.com/kubeapps/kubeapps" + url: "https://github.com/vmware-tanzu/kubeapps" paths: # Endpoints defined at pkg/http-handler/http-handler.go "/api/v1/clusters/{cluster}/can-i": diff --git a/dashboard/src/components/AppList/AppListGrid.tsx b/dashboard/src/components/AppList/AppListGrid.tsx index 991d4f70bfd..cc5fcea5c21 100644 --- a/dashboard/src/components/AppList/AppListGrid.tsx +++ b/dashboard/src/components/AppList/AppListGrid.tsx @@ -40,7 +40,7 @@ function AppListGrid(props: IAppListProps) { Start browsing your favourite apps{" "} or check the{" "} diff --git a/dashboard/src/components/AppView/AppView.tsx b/dashboard/src/components/AppView/AppView.tsx index e5fb92ceb80..d94a48f7003 100644 --- a/dashboard/src/components/AppView/AppView.tsx +++ b/dashboard/src/components/AppView/AppView.tsx @@ -184,7 +184,7 @@ export default function AppView() { // correct (ie. Package is "Pending" required RBAC). The work-around here // is to continue polling for the resource refs every two seconds as long // as a `NotFound` is returned. - // See https://github.com/kubeapps/kubeapps/issues/4337 + // See https://github.com/vmware-tanzu/kubeapps/issues/4337 let abort = false; const fetchResourceRefs = async () => { while (!abort) { diff --git a/dashboard/src/components/Catalog/Catalog.test.tsx b/dashboard/src/components/Catalog/Catalog.test.tsx index 4ca0de09269..7a59fd57373 100644 --- a/dashboard/src/components/Catalog/Catalog.test.tsx +++ b/dashboard/src/components/Catalog/Catalog.test.tsx @@ -593,7 +593,7 @@ describe("pagination and package fetching", () => { expect(setPage).toHaveBeenCalledWith(0); }); // TODO(agamez): add a test case covering it "resets page when one of the filters changes" - // https://github.com/kubeapps/kubeapps/pull/2264/files/0d3c77448543668255809bf05039aca704cf729f..22343137efb1c2292b0aa4795f02124306cb055e#r565486271 + // https://github.com/vmware-tanzu/kubeapps/pull/2264/files/0d3c77448543668255809bf05039aca704cf729f..22343137efb1c2292b0aa4795f02124306cb055e#r565486271 }); }); diff --git a/dashboard/src/components/Catalog/Catalog.tsx b/dashboard/src/components/Catalog/Catalog.tsx index e7fc923bc68..eb7631cdec1 100644 --- a/dashboard/src/components/Catalog/Catalog.tsx +++ b/dashboard/src/components/Catalog/Catalog.tsx @@ -56,7 +56,7 @@ export function filtersToQuery(filters: any) { let query = ""; const activeFilters = Object.keys(filters).filter(f => filters[f].length); if (activeFilters.length) { - // https://github.com/kubeapps/kubeapps/pull/2279 + // https://github.com/vmware-tanzu/kubeapps/pull/2279 // get parameters from the parsed and decoded query params // since some search filters could eventually have a ',' // we need to temporary replace it by other arbitrary string '__'. @@ -219,7 +219,7 @@ export default function Catalog() { c => filters[filterNames.REPO].length === 0 || // TODO(agamez): get the repo name once available - // https://github.com/kubeapps/kubeapps/issues/3165#issuecomment-884574732 + // https://github.com/vmware-tanzu/kubeapps/issues/3165#issuecomment-884574732 filters[filterNames.REPO].includes(c.availablePackageRef?.identifier.split("/")[0]), ) .filter( @@ -356,7 +356,7 @@ export default function Catalog() { Kubeapps documentation diff --git a/dashboard/src/components/Config/AppRepoList/AppRepoAddDockerCreds.tsx b/dashboard/src/components/Config/AppRepoList/AppRepoAddDockerCreds.tsx index 60c895db702..a8fabc1b7fd 100644 --- a/dashboard/src/components/Config/AppRepoList/AppRepoAddDockerCreds.tsx +++ b/dashboard/src/components/Config/AppRepoList/AppRepoAddDockerCreds.tsx @@ -102,7 +102,7 @@ export function AppRepoAddDockerCreds({ here @@ -115,7 +115,7 @@ export function AppRepoAddDockerCreds({ Select existing secret(s) to access a private Docker registry and pull images from it. More info{" "} diff --git a/dashboard/src/components/Config/AppRepoList/AppRepoControl.tsx b/dashboard/src/components/Config/AppRepoList/AppRepoControl.tsx index c2bd0529ed0..73067cf94d2 100644 --- a/dashboard/src/components/Config/AppRepoList/AppRepoControl.tsx +++ b/dashboard/src/components/Config/AppRepoList/AppRepoControl.tsx @@ -39,7 +39,7 @@ export function AppRepoControl({ repo, kubeappsNamespace, refetchRepos }: IAppRe dispatch(actions.repos.resyncRepo(repoName, repoNamespace)); // Fake timeout to show progress // TODO(andresmgot): Ideally, we should show the progress of the sync but we don't - // have that info yet: https://github.com/kubeapps/kubeapps/issues/153 + // have that info yet: https://github.com/vmware-tanzu/kubeapps/issues/153 setTimeout(() => setRefreshing(false), 500); }; }; diff --git a/dashboard/src/components/Config/AppRepoList/AppRepoForm.tsx b/dashboard/src/components/Config/AppRepoList/AppRepoForm.tsx index 91413f78aee..ffbce731727 100644 --- a/dashboard/src/components/Config/AppRepoList/AppRepoForm.tsx +++ b/dashboard/src/components/Config/AppRepoList/AppRepoForm.tsx @@ -589,7 +589,7 @@ export function AppRepoForm(props: IAppRepoFormProps) { here diff --git a/dashboard/src/components/Config/AppRepoList/AppRepoRefreshAllButton.tsx b/dashboard/src/components/Config/AppRepoList/AppRepoRefreshAllButton.tsx index e5761f18ec1..fb519e67a04 100644 --- a/dashboard/src/components/Config/AppRepoList/AppRepoRefreshAllButton.tsx +++ b/dashboard/src/components/Config/AppRepoList/AppRepoRefreshAllButton.tsx @@ -16,7 +16,7 @@ export function AppRepoRefreshAllButton() { const handleResyncAllClick = async () => { // Fake timeout to show progress // TODO(andresmgot): Ideally, we should show the progress of the sync but we don't - // have that info yet: https://github.com/kubeapps/kubeapps/issues/153 + // have that info yet: https://github.com/vmware-tanzu/kubeapps/issues/153 setRefreshing(true); setTimeout(() => setRefreshing(false), 500); if (repos) { diff --git a/dashboard/src/components/DeploymentFormBody/BasicDeploymentForm/Param.tsx b/dashboard/src/components/DeploymentFormBody/BasicDeploymentForm/Param.tsx index 0571c06aa16..a323f886ffc 100644 --- a/dashboard/src/components/DeploymentFormBody/BasicDeploymentForm/Param.tsx +++ b/dashboard/src/components/DeploymentFormBody/BasicDeploymentForm/Param.tsx @@ -93,7 +93,7 @@ export default function Param({ if (paramDeploymentEvent == null) { let val = getValue(appValues, path); // retrieve the value that the property pointed by path should have to be hidden. - // https://github.com/kubeapps/kubeapps/issues/1913 + // https://github.com/vmware-tanzu/kubeapps/issues/1913 if (val === undefined) { const target = getParamMatchingPath(allParams, path); val = target?.value; diff --git a/dashboard/src/components/DeploymentFormBody/DeploymentFormBody.test.tsx b/dashboard/src/components/DeploymentFormBody/DeploymentFormBody.test.tsx index a3357914b9f..1a5cf3c161e 100644 --- a/dashboard/src/components/DeploymentFormBody/DeploymentFormBody.test.tsx +++ b/dashboard/src/components/DeploymentFormBody/DeploymentFormBody.test.tsx @@ -31,7 +31,7 @@ const versions = [{ appVersion: "10.0.0", pkgVersion: "1.2.3" }] as PackageAppVe // Note that most of the tests that cover DeploymentFormBody component are in // in the DeploymentForm and UpgradeForm parent components -// Context at https://github.com/kubeapps/kubeapps/issues/1293 +// Context at https://github.com/vmware-tanzu/kubeapps/issues/1293 it("should modify the original values of the differential component if parsed as YAML object", () => { const oldValues = `a: b diff --git a/dashboard/src/components/Header/Menu.tsx b/dashboard/src/components/Header/Menu.tsx index 18679c2024e..036b8c1f772 100644 --- a/dashboard/src/components/Header/Menu.tsx +++ b/dashboard/src/components/Header/Menu.tsx @@ -102,7 +102,7 @@ function Menu({ clusters, appVersion, logout }: IContextSelectorProps) {
Made with by VMware and{" "} { it("renders a link to the access control documentation", () => { const wrapper = mountWrapper(defaultStore, ); expect(wrapper.find("a").props()).toMatchObject({ - href: "https://github.com/kubeapps/kubeapps/blob/devel/docs/howto/access-control.md", + href: "https://github.com/vmware-tanzu/kubeapps/blob/devel/docs/howto/access-control.md", target: "_blank", }); }); diff --git a/dashboard/src/components/LoginForm/LoginForm.tsx b/dashboard/src/components/LoginForm/LoginForm.tsx index dbf7539ba61..2cd94188cd8 100644 --- a/dashboard/src/components/LoginForm/LoginForm.tsx +++ b/dashboard/src/components/LoginForm/LoginForm.tsx @@ -109,7 +109,7 @@ function LoginForm(props: ILoginFormProps) { )}
diff --git a/dashboard/src/components/OperatorList/OperatorList.tsx b/dashboard/src/components/OperatorList/OperatorList.tsx index 201af93c194..866f4b00b30 100644 --- a/dashboard/src/components/OperatorList/OperatorList.tsx +++ b/dashboard/src/components/OperatorList/OperatorList.tsx @@ -215,7 +215,7 @@ export default function OperatorList({ here. diff --git a/dashboard/src/components/OperatorNew/OperatorNew.test.tsx b/dashboard/src/components/OperatorNew/OperatorNew.test.tsx index c1aa0ba6110..14632bd280a 100644 --- a/dashboard/src/components/OperatorNew/OperatorNew.test.tsx +++ b/dashboard/src/components/OperatorNew/OperatorNew.test.tsx @@ -39,7 +39,7 @@ const defaultOperator = { description: "this is a testing operator", annotations: { capabilities: "Basic Install", - repository: "github.com/kubeapps/kubeapps", + repository: "github.com/vmware-tanzu/kubeapps", containerImage: "kubeapps/kubeapps", createdAt: "one day", }, diff --git a/dashboard/src/components/OperatorSummary/OperatorSummary.test.tsx b/dashboard/src/components/OperatorSummary/OperatorSummary.test.tsx index c5403d6196b..a5aba83f60a 100644 --- a/dashboard/src/components/OperatorSummary/OperatorSummary.test.tsx +++ b/dashboard/src/components/OperatorSummary/OperatorSummary.test.tsx @@ -27,7 +27,7 @@ const defaultOperator = { description: "this is a testing operator", annotations: { capabilities: "Basic Install", - repository: "github.com/kubeapps/kubeapps", + repository: "github.com/vmware-tanzu/kubeapps", containerImage: "kubeapps/kubeapps", createdAt: "one day", }, diff --git a/dashboard/src/components/OperatorView/OperatorView.test.tsx b/dashboard/src/components/OperatorView/OperatorView.test.tsx index 9c9ab9b3ad0..e79bb4b576c 100644 --- a/dashboard/src/components/OperatorView/OperatorView.test.tsx +++ b/dashboard/src/components/OperatorView/OperatorView.test.tsx @@ -35,7 +35,7 @@ const defaultOperator = { description: "this is a testing operator", annotations: { capabilities: "Basic Install", - repository: "github.com/kubeapps/kubeapps", + repository: "github.com/vmware-tanzu/kubeapps", containerImage: "kubeapps/kubeapps", createdAt: "one day", }, diff --git a/dashboard/src/gen/google/api/annotations.ts b/dashboard/src/gen/google/api/annotations.ts index b0b6729f484..6e6ca01470c 100644 --- a/dashboard/src/gen/google/api/annotations.ts +++ b/dashboard/src/gen/google/api/annotations.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.api"; diff --git a/dashboard/src/gen/google/api/http.ts b/dashboard/src/gen/google/api/http.ts index 582b369db23..1cd83268bde 100644 --- a/dashboard/src/gen/google/api/http.ts +++ b/dashboard/src/gen/google/api/http.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.api"; diff --git a/dashboard/src/gen/google/protobuf/any.ts b/dashboard/src/gen/google/protobuf/any.ts index 1a6f7b41b78..10c07c66d45 100644 --- a/dashboard/src/gen/google/protobuf/any.ts +++ b/dashboard/src/gen/google/protobuf/any.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.protobuf"; diff --git a/dashboard/src/gen/google/protobuf/descriptor.ts b/dashboard/src/gen/google/protobuf/descriptor.ts index ca193ea5cc9..572d5a7c028 100644 --- a/dashboard/src/gen/google/protobuf/descriptor.ts +++ b/dashboard/src/gen/google/protobuf/descriptor.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.protobuf"; diff --git a/dashboard/src/gen/google/protobuf/struct.ts b/dashboard/src/gen/google/protobuf/struct.ts index 4b9007044b6..a5c5d4cf2bf 100644 --- a/dashboard/src/gen/google/protobuf/struct.ts +++ b/dashboard/src/gen/google/protobuf/struct.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "google.protobuf"; diff --git a/dashboard/src/gen/kubeappsapis/apidocs/v1alpha1/apidocs.ts b/dashboard/src/gen/kubeappsapis/apidocs/v1alpha1/apidocs.ts index 7a9600dd291..97d04686a4f 100644 --- a/dashboard/src/gen/kubeappsapis/apidocs/v1alpha1/apidocs.ts +++ b/dashboard/src/gen/kubeappsapis/apidocs/v1alpha1/apidocs.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "kubeappsapis.apidocs.v1alpha1"; diff --git a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages.ts b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages.ts index 07277373806..b50722650c8 100644 --- a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages.ts +++ b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { Any } from "../../../../google/protobuf/any"; import { Plugin } from "../../../../kubeappsapis/core/plugins/v1alpha1/plugins"; import { BrowserHeaders } from "browser-headers"; diff --git a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories.ts b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories.ts index b851d77bd15..baaee1d50d7 100644 --- a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories.ts +++ b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { Context } from "../../../../kubeappsapis/core/packages/v1alpha1/packages"; import { Plugin } from "../../../../kubeappsapis/core/plugins/v1alpha1/plugins"; import { Any } from "../../../../google/protobuf/any"; diff --git a/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins.ts b/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins.ts index f2bb4f15682..c9f26031391 100644 --- a/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins.ts +++ b/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { BrowserHeaders } from "browser-headers"; export const protobufPackage = "kubeappsapis.core.plugins.v1alpha1"; diff --git a/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.ts b/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.ts index 25064b03891..e9df3e4c8bd 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { GetAvailablePackageSummariesRequest, GetAvailablePackageDetailRequest, diff --git a/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm.ts b/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm.ts index 9a2b07cea43..b6235757c21 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { InstalledPackageReference, GetAvailablePackageSummariesRequest, diff --git a/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.ts b/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.ts index acc54171cf8..25e582f32d2 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { Context, GetAvailablePackageSummariesRequest, diff --git a/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources.ts b/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources.ts index d0b916add09..12360c293bb 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources.ts @@ -1,7 +1,7 @@ /* eslint-disable */ import Long from "long"; import { grpc } from "@improbable-eng/grpc-web"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { InstalledPackageReference, ResourceRef, @@ -1211,7 +1211,7 @@ export const GetSecretNamesResponse = { ? Object.entries(object.secretNames).reduce<{ [key: string]: SecretType; }>((acc, [key, value]) => { - acc[key] = value as number; + acc[key] = value as SecretType; return acc; }, {}) : {}, @@ -1237,7 +1237,7 @@ export const GetSecretNamesResponse = { [key: string]: SecretType; }>((acc, [key, value]) => { if (value !== undefined) { - acc[key] = value as number; + acc[key] = value as SecretType; } return acc; }, {}); diff --git a/dashboard/src/gen/protoc-gen-openapiv2/options/annotations.ts b/dashboard/src/gen/protoc-gen-openapiv2/options/annotations.ts index dbe99cbc4e8..ca1dc9c999d 100644 --- a/dashboard/src/gen/protoc-gen-openapiv2/options/annotations.ts +++ b/dashboard/src/gen/protoc-gen-openapiv2/options/annotations.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; export const protobufPackage = "grpc.gateway.protoc_gen_openapiv2.options"; diff --git a/dashboard/src/gen/protoc-gen-openapiv2/options/openapiv2.ts b/dashboard/src/gen/protoc-gen-openapiv2/options/openapiv2.ts index 26db5bbdc0f..37152a098a0 100644 --- a/dashboard/src/gen/protoc-gen-openapiv2/options/openapiv2.ts +++ b/dashboard/src/gen/protoc-gen-openapiv2/options/openapiv2.ts @@ -1,6 +1,6 @@ /* eslint-disable */ import Long from "long"; -import _m0 from "protobufjs/minimal"; +import * as _m0 from "protobufjs/minimal"; import { Value } from "../../google/protobuf/struct"; export const protobufPackage = "grpc.gateway.protoc_gen_openapiv2.options"; diff --git a/dashboard/src/shared/KubeappsGrpcClient.test.ts b/dashboard/src/shared/KubeappsGrpcClient.test.ts index 08eb72c6aca..420930c4ca5 100644 --- a/dashboard/src/shared/KubeappsGrpcClient.test.ts +++ b/dashboard/src/shared/KubeappsGrpcClient.test.ts @@ -90,7 +90,7 @@ describe("kubeapps grpc core plugin service", () => { }); // TODO(agamez): try to also mock the messages ussing the new FakeTransportBuilder().withMessages([]) - // More details: https://github.com/kubeapps/kubeapps/issues/3165#issuecomment-882944035 + // More details: https://github.com/vmware-tanzu/kubeapps/issues/3165#issuecomment-882944035 }); describe("kubeapps grpc resources plugin service", () => { diff --git a/docs/background/update-api-docs.md b/docs/background/update-api-docs.md index d47007971ba..38b94592829 100644 --- a/docs/background/update-api-docs.md +++ b/docs/background/update-api-docs.md @@ -45,4 +45,4 @@ Finally, after pushing the changes in the desired branch of your fork, it is pos ## Versioning policy Kubeapps API is still in a very initial stage and it likely subject to changes. Wherefore, for the sake of simplicity, we are not publishing new versions in SwaggerHub. Instead, we will keep just the latest version and will overwrite it with upcoming changes. -Note that the [openapi.yaml](../../main/dashboard/public/openapi.yaml) file corresponding to each Kubeapps version can still be downloaded as part of the normal [Kubeapps releases page](https://github.com/kubeapps/kubeapps/releases). +Note that the [openapi.yaml](../../main/dashboard/public/openapi.yaml) file corresponding to each Kubeapps version can still be downloaded as part of the normal [Kubeapps releases page](https://github.com/vmware-tanzu/kubeapps/releases). diff --git a/docs/howto/OIDC/OAuth2OIDC-keycloak.md b/docs/howto/OIDC/OAuth2OIDC-keycloak.md index 66bf9f6d1be..7a88321434a 100644 --- a/docs/howto/OIDC/OAuth2OIDC-keycloak.md +++ b/docs/howto/OIDC/OAuth2OIDC-keycloak.md @@ -1,9 +1,9 @@ # Configuring Keycloak as an OIDC provider This document explains how to configure Keycloak as an IDP + OIDC provider (check general information and pre-requisites for [using an OAuth2/OIDC Provider with Kubeapps](../using-an-OIDC-provider.md)). -It covers the installation and documentation for Kubeapps interacting with two Kubernetes clusters. +It covers the installation and documentation for Kubeapps interacting with two Kubernetes clusters. -The installation used the [bitnami chart for Keycloak](https://github.com/bitnami/charts/tree/master/bitnami/keycloak) (version 12.0.4/2.4.8) and [bitnami chart for Kubeapps](https://github.com/bitnami/charts/tree/master/bitnami/kubeapps) (version 7.0.0/2.3.2) +The installation used the [bitnami chart for Keycloak](https://github.com/bitnami/charts/tree/master/bitnami/keycloak) (version 12.0.4/2.4.8) and [bitnami chart for Kubeapps](https://github.com/bitnami/charts/tree/master/bitnami/kubeapps) (version 7.0.0/2.3.2) # Keycloak Installation @@ -204,7 +204,7 @@ As for the cluster clients, we need to configure the client scopes: The last step is to configure the `kubeapps` client to be aware of the two cluster clients and be allowed to invoke them. There are different ways to configure Keycloak: - Using automatic audience resolution. We haven't explored this method yet, therefore it won't be covered in this guide. - Via Client Scopes: define the cluster clients as Client Scopes and add them to `kubeapps`. - - Via Mappers in the client: define a mapper attached to the `kubeapps` client that will inject the client ids in th audience claim. + - Via Mappers in the client: define a mapper attached to the `kubeapps` client that will inject the client ids in th audience claim. #### Option #2 @@ -270,7 +270,7 @@ frontend: # Auth Proxy configuration for OIDC support -# ref: https://github.com/kubeapps/kubeapps/blob/master/docs/tutorials/using-an-OIDC-provider.md +# ref: https://github.com/vmware-tanzu/kubeapps/blob/master/docs/tutorials/using-an-OIDC-provider.md authProxy: ## Set to true if Kubeapps should configure the OAuth login/logout URIs defined below. # diff --git a/docs/howto/basic-form-support.md b/docs/howto/basic-form-support.md index 46d9a3e3971..81648adf891 100644 --- a/docs/howto/basic-form-support.md +++ b/docs/howto/basic-form-support.md @@ -9,7 +9,7 @@ Since Kubeapps 1.6.0, it's possible to include a JSON schema with a chart that d The goal of this feature is to present the user with the most common parameters which are typically modified before deploying a chart (like username and password) in a more user-friendly form. -This document specifies what's needed to be defined in order to present this basic form to the users of a chart. If the basic form components do not fit your needs we also offer the ability for developers to inject their own custom components, the integration docs can be found [here](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/custom-form-component-support.md). +This document specifies what's needed to be defined in order to present this basic form to the users of a chart. If the basic form components do not fit your needs we also offer the ability for developers to inject their own custom components, the integration docs can be found [here](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/custom-form-component-support.md). ## Create a values.schema.json diff --git a/docs/howto/custom-app-view-support.md b/docs/howto/custom-app-view-support.md index 0508c3e3d38..e6d6f581f3d 100644 --- a/docs/howto/custom-app-view-support.md +++ b/docs/howto/custom-app-view-support.md @@ -1,6 +1,6 @@ # Custom App View Support -In addition to our [custom form component support](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/custom-form-component-support.md) we now support the ability for developers to inject custom app views for specific deployments. +In addition to our [custom form component support](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/custom-form-component-support.md) we now support the ability for developers to inject custom app views for specific deployments. ## Step-by-step integration process @@ -28,4 +28,4 @@ In addition to our [custom form component support](https://github.com/kubeapps/k ## Example Code -In an effort to make getting antiquated with the feature easier we provide some demo code for you to play around with and explore the props that the dashboard supplies. The examples can be found in the [developer documentation examples](https://github.com/kubeapps/kubeapps/tree/main/docs/reference/examples). [CustomAppView.jsx](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/examples/CustomAppView.jsx) is a demo Application View that will get you familiar w/ the props and handlers that we pass as props. The props are displayed in plain text and the buttons are wired up to use the handlers that mirror the buttons in the normal Application View. We also provide a complied bundle version [CustomAppView.min.js](https://github.com/kubeapps/kubeapps/blob/main/doc/reference/examples/CustomAppView.min.js) which you can load into the configmap and render. +In an effort to make getting antiquated with the feature easier we provide some demo code for you to play around with and explore the props that the dashboard supplies. The examples can be found in the [developer documentation examples](https://github.com/vmware-tanzu/kubeapps/tree/main/docs/reference/examples). [CustomAppView.jsx](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/examples/CustomAppView.jsx) is a demo Application View that will get you familiar w/ the props and handlers that we pass as props. The props are displayed in plain text and the buttons are wired up to use the handlers that mirror the buttons in the normal Application View. We also provide a complied bundle version [CustomAppView.min.js](https://github.com/vmware-tanzu/kubeapps/blob/main/doc/reference/examples/CustomAppView.min.js) which you can load into the configmap and render. diff --git a/docs/howto/custom-form-component-support.md b/docs/howto/custom-form-component-support.md index 93831b84d0b..26d17d318e1 100644 --- a/docs/howto/custom-form-component-support.md +++ b/docs/howto/custom-form-component-support.md @@ -1,6 +1,6 @@ # Custom Form Component Support -This is an extension to the [basic form support](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/basic-form-support.md#basic-form-support) +This is an extension to the [basic form support](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/basic-form-support.md#basic-form-support) ## Possible use cases @@ -19,7 +19,7 @@ This is an extension to the [basic form support](https://github.com/kubeapps/kub Note: The file can be located anywhere on your file system or even a remote source! Alternatively we provide remote loading by setting the `remoteComponentsUrl` value to the URL that is serving your bundle. If this is not set, the configmap will be the default loader. -3. Once the deployment is complete you will need a values json that will signal to Kubeapps that we want to render a custom component and not one fo the provided ones. To do that you will need a `values.json.schema` that has a `customComponent` key, more info [here](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/custom-form-component-support.md#render-a-custom-component). +3. Once the deployment is complete you will need a values json that will signal to Kubeapps that we want to render a custom component and not one fo the provided ones. To do that you will need a `values.json.schema` that has a `customComponent` key, more info [here](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/custom-form-component-support.md#render-a-custom-component). ## Render a custom component @@ -43,7 +43,7 @@ Note: The `customComponent` field **MUST BE AN OBJECT**. This design decision wa ## Updating Helm values with custom components -Custom form components would be useless without the ability to interact with the YAML state. To do this your custom components should be set up to receive 2 props: `handleBasicFormParamChange` and `param`. `param` is the current json object this is being rendered (denoted by the `customComponent` field) and `handleBasicFormParamChange` which is a function that updates the YAML file. An example of how you use this function can be found in any of the BasicDeploymentForm components such as the [SliderParam](https://github.com/kubeapps/kubeapps/blob/main/dashboard/src/components/DeploymentFormBody/BasicDeploymentForm/SliderParam.tsx#L47-L53). +Custom form components would be useless without the ability to interact with the YAML state. To do this your custom components should be set up to receive 2 props: `handleBasicFormParamChange` and `param`. `param` is the current json object this is being rendered (denoted by the `customComponent` field) and `handleBasicFormParamChange` which is a function that updates the YAML file. An example of how you use this function can be found in any of the BasicDeploymentForm components such as the [SliderParam](https://github.com/vmware-tanzu/kubeapps/blob/main/dashboard/src/components/DeploymentFormBody/BasicDeploymentForm/SliderParam.tsx#L47-L53). ``` const handleParamChange = (newValue: number) => { @@ -57,4 +57,4 @@ Custom form components would be useless without the ability to interact with the ## Tips -To help you get started we provide some examples that you can try [here](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/examples). The three files should give you a good idea about how to start developing and building your own custom components. `CustomComponent.jsx` is a super simple react component that takes the `handleBasicFormParamChange` and `param` props and renders a button that changes the value to 'test'. `CustomComponent.js` is the JavaScript variant of `CustomComponent.jsx` and `CustomComponent.min.js` is a minified js bundle created using [remote-component-starter](https://github.com/Paciolan/remote-component-starter), which is specifically made to help build components that you want to load remotely with the [remote-component](https://github.com/Paciolan/remote-component) tool used by Kubeapps. +To help you get started we provide some examples that you can try [here](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/examples). The three files should give you a good idea about how to start developing and building your own custom components. `CustomComponent.jsx` is a super simple react component that takes the `handleBasicFormParamChange` and `param` props and renders a button that changes the value to 'test'. `CustomComponent.js` is the JavaScript variant of `CustomComponent.jsx` and `CustomComponent.min.js` is a minified js bundle created using [remote-component-starter](https://github.com/Paciolan/remote-component-starter), which is specifically made to help build components that you want to load remotely with the [remote-component](https://github.com/Paciolan/remote-component) tool used by Kubeapps. diff --git a/docs/howto/dashboard.md b/docs/howto/dashboard.md index 7b5abfc880d..fbed04edad4 100644 --- a/docs/howto/dashboard.md +++ b/docs/howto/dashboard.md @@ -1,6 +1,6 @@ # Using the Dashboard -Once you have [installed Kubeapps in your cluster](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps) you can use the Dashboard to start managing and deploying applications in your cluster. Checkout the [Getting Started](./getting-started.md) guide to learn how to access the Dashboard and deploy your first application. +Once you have [installed Kubeapps in your cluster](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps) you can use the Dashboard to start managing and deploying applications in your cluster. Checkout the [Getting Started](./getting-started.md) guide to learn how to access the Dashboard and deploy your first application. The following sections walk you through some common tasks with the Kubeapps Dashboard. diff --git a/docs/howto/deploying-to-multiple-clusters.md b/docs/howto/deploying-to-multiple-clusters.md index f3f2e002edd..5133574d285 100644 --- a/docs/howto/deploying-to-multiple-clusters.md +++ b/docs/howto/deploying-to-multiple-clusters.md @@ -37,10 +37,10 @@ Certain multi-cluster environments, such as Tanzu Kubernetes Grid, have specific If you are testing the multi-cluster support on a local [Kubernetes-in-Docker cluster](https://kind.sigs.k8s.io/), you can view the example configuration files used for configuring two kind clusters in a local development environment: -- [Kubeapps cluster API server config](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-apiserver-config.yaml) -- An [additional cluster API server config](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-additional-apiserver-config.yaml) +- [Kubeapps cluster API server config](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-apiserver-config.yaml) +- An [additional cluster API server config](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-additional-apiserver-config.yaml) -These are used with an instance of Dex running in the Kubeapps cluster with a [matching configuration](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-dex-values.yaml) and Kubeapps itself [configured with its own auth-proxy](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-auth-proxy-values.yaml). +These are used with an instance of Dex running in the Kubeapps cluster with a [matching configuration](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-dex-values.yaml) and Kubeapps itself [configured with its own auth-proxy](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-auth-proxy-values.yaml). Configuring your Kubernetes cluster for OIDC authentication can be tricky, despite the upstream documentation, so be prepared to check the logs of your `kube-apiserver` pod: @@ -101,7 +101,7 @@ kubectl --kubeconfig ~/.kube/path-to-kube-confnig-file config view --raw -o json Alternatively, for a development with private API server URLs, you can omit the `certificateAuthorityData` and instead include the field `insecure: true` for a cluster and Kubeapps will not try to verify the secure connection. -A serviceToken is not required but provides a better user experience, enabling users viewing the cluster to see the namespaces to which they have access (only) when they use the namespace selector. It's also used to retrieve icons of the available operators if the OLM is enabled. The service token should be configured with RBAC so that it can list those resources. You can refer to the [example used for a local development environment](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-namespace-discovery-rbac.yaml). +A serviceToken is not required but provides a better user experience, enabling users viewing the cluster to see the namespaces to which they have access (only) when they use the namespace selector. It's also used to retrieve icons of the available operators if the OLM is enabled. The service token should be configured with RBAC so that it can list those resources. You can refer to the [example used for a local development environment](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-namespace-discovery-rbac.yaml). Your Kubeapps installation will also need to be [configured to use OIDC for authentication](./using-an-OIDC-provider.md) with a client-id for your chosen provider. @@ -119,7 +119,7 @@ First your OIDC Provider needs to be configured so that tokens issued for the cl ### Configuring the auth-proxy to request multiple audiences -The second part of the additional configuration is to ensure that when Kubeapps' auth-proxy requests a token that it includes extra scopes, such as `audience:server:client_id:second-cluster` for each additional audience that it requires in the issued token. For example, you can view the [auth-proxy configuration used in the local development environment](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-auth-proxy-values.yaml) and see the additional scopes included there to ensure that the `second-cluster` and `third-cluster` are included in the audience of the resulting token. +The second part of the additional configuration is to ensure that when Kubeapps' auth-proxy requests a token that it includes extra scopes, such as `audience:server:client_id:second-cluster` for each additional audience that it requires in the issued token. For example, you can view the [auth-proxy configuration used in the local development environment](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/manifests/kubeapps-local-dev-auth-proxy-values.yaml) and see the additional scopes included there to ensure that the `second-cluster` and `third-cluster` are included in the audience of the resulting token. ## Updating multi-cluster options diff --git a/docs/howto/syncing-apprepository-webhook.md b/docs/howto/syncing-apprepository-webhook.md index df287e188da..c7dfe129562 100644 --- a/docs/howto/syncing-apprepository-webhook.md +++ b/docs/howto/syncing-apprepository-webhook.md @@ -2,7 +2,7 @@ ## Introduction -Kubeapps's default configuration schedules the syncing process of the App Repositories every _ten minutes_. However, this behavior can be easily changed globally by editing the [values.yaml file](https://github.com/kubeapps/kubeapps/blob/main/chart/kubeapps/values.yaml#L215) (`crontab: "*/10 * * * *"`). +Kubeapps's default configuration schedules the syncing process of the App Repositories every _ten minutes_. However, this behavior can be easily changed globally by editing the [values.yaml file](https://github.com/vmware-tanzu/kubeapps/blob/main/chart/kubeapps/values.yaml#L215) (`crontab: "*/10 * * * *"`). Nevertheless, this default approach might not be useful for environments with highly frequent changes. Moreover, if there are a few App Repositories with numerous changes while others hardly are modified, therefore, increasing the default global syncing periodicity is not a good approach. @@ -13,7 +13,7 @@ Webhook notifications provide information about events in JSON format and are us The example below will use Harbor for explaining how a webhook is configured for triggering an App Repository sync process. -> In other platforms the process will be pretty similar. Doubts? Please feel free to [open an issue](https://github.com/kubeapps/kubeapps/issues/new) if you need further guidance! +> In other platforms the process will be pretty similar. Doubts? Please feel free to [open an issue](https://github.com/vmware-tanzu/kubeapps/issues/new) if you need further guidance! ## Creating and granting a ServiceAccount for authenticating requests @@ -115,4 +115,4 @@ This picture illustrates the configuration of a webhook in Habor: ## Final remarks Currently, Kubeapps does not process any payload. Therefore, the information that the platform may send as part of the `POST` request will be ignored. -Feel free to [open an issue](https://github.com/kubeapps/kubeapps/issues/new) if you need further guidance or your use case is not matching with this approach. +Feel free to [open an issue](https://github.com/vmware-tanzu/kubeapps/issues/new) if you need further guidance or your use case is not matching with this approach. diff --git a/docs/reference/design-proposals/authentication-and-authorization.md b/docs/reference/design-proposals/authentication-and-authorization.md index 8affcc6b558..8461d4178e1 100644 --- a/docs/reference/design-proposals/authentication-and-authorization.md +++ b/docs/reference/design-proposals/authentication-and-authorization.md @@ -44,7 +44,7 @@ Configuring an authentication provider is typically done by a cluster operator, ### Logging in with Client Certificate/Key Auth -Client certificate and key pairs are a common way to authenticate against a cluster. The Kubeconfig can either point to certificates or keys in the filesystem, or they can be embedded within the file as base64 encoded strings. Unfortunately for Kubeapps, it is not possible to include a client certificate and key pair in an XMLHttpRequest (browser AJAX request), so we would not be able to leverage client certificate/key authentication within Kubeapps (see [#200](https://github.com/kubeapps/kubeapps/issues/200#issuecomment-376617420)). +Client certificate and key pairs are a common way to authenticate against a cluster. The Kubeconfig can either point to certificates or keys in the filesystem, or they can be embedded within the file as base64 encoded strings. Unfortunately for Kubeapps, it is not possible to include a client certificate and key pair in an XMLHttpRequest (browser AJAX request), so we would not be able to leverage client certificate/key authentication within Kubeapps (see [#200](https://github.com/vmware-tanzu/kubeapps/issues/200#issuecomment-376617420)). ### Logging in with Token Auth diff --git a/docs/reference/design-proposals/clarity-ui.md b/docs/reference/design-proposals/clarity-ui.md index 1b953c4bee5..13908557ac5 100644 --- a/docs/reference/design-proposals/clarity-ui.md +++ b/docs/reference/design-proposals/clarity-ui.md @@ -1,6 +1,6 @@ # Update Kubeapps to use clarity.design -Issue https://github.com/kubeapps/kubeapps/issues/1354 +Issue https://github.com/vmware-tanzu/kubeapps/issues/1354 The goal of this proposal is to define how the new UI of Kubeapps will look like. To make collaboration easier, a Google doc is available: diff --git a/docs/reference/design-proposals/dashboard/application-view-revamp.md b/docs/reference/design-proposals/dashboard/application-view-revamp.md index bea5a7b5eda..37fe78c09cb 100644 --- a/docs/reference/design-proposals/dashboard/application-view-revamp.md +++ b/docs/reference/design-proposals/dashboard/application-view-revamp.md @@ -2,13 +2,13 @@ The goal of this document is to define in detail the actions planned to improve the current user experience when working with applications. -Parent issue: https://github.com/kubeapps/kubeapps/issues/1524 +Parent issue: https://github.com/vmware-tanzu/kubeapps/issues/1524 ## Goal The goal of this revamp is to improve the Application View, which is one of the core views of the project so it gives a better user experience in different areas: -- Discoverability. It should be possible to obtain information about the application dependencies. For example, Kubeapps should show that MariaDB is a dependency of WordPress. Details at https://github.com/kubeapps/kubeapps/issues/529 +- Discoverability. It should be possible to obtain information about the application dependencies. For example, Kubeapps should show that MariaDB is a dependency of WordPress. Details at https://github.com/vmware-tanzu/kubeapps/issues/529 - Error Detection. Make an easy to understand view that can point the user to the piece(s) of the chart that is failing. - Usability. Make it easier, if possible, to modify/upgrade/rollback/test/delete an application. - Debugging. When something fails while working with a release, it should be possible to detect the cause of the issue and fix it without the need of a terminal. This means being able to report kubernetes events/errors to the user and being able to read logs. @@ -64,7 +64,7 @@ We could also differentiate between the configuration and the upgrade actions. W The current list of URLs can be improved with two small changes: - If the browser can access the URL, we could show an icon so the user knows if the URL is working. -- If the URL is not working and the cause is well known, we could show additional information for the user to debug it (e.g. Pending IPs when using LoadBalancers in Minikube [link](https://github.com/kubeapps/kubeapps/issues/953)). +- If the URL is not working and the cause is well known, we could show additional information for the user to debug it (e.g. Pending IPs when using LoadBalancers in Minikube [link](https://github.com/vmware-tanzu/kubeapps/issues/953)). diff --git a/docs/reference/design-proposals/dashboard/error-handling/error-handling.md b/docs/reference/design-proposals/dashboard/error-handling/error-handling.md index 27c853dc79e..ccf17df5a29 100644 --- a/docs/reference/design-proposals/dashboard/error-handling/error-handling.md +++ b/docs/reference/design-proposals/dashboard/error-handling/error-handling.md @@ -6,7 +6,7 @@ Date: 2018/10/02 Type: Design Doc -Issue: [kubeapps#657](https://github.com/kubeapps/kubeapps/issues/657) +Issue: [kubeapps#657](https://github.com/vmware-tanzu/kubeapps/issues/657) ## Objective @@ -37,7 +37,7 @@ Today, we are handling errors per-case basis, which is good if we want to react Why do we need a catch all? -Currently, if the application experiences a runtime error, the application stops rendering, but does not notify the user that something went wrong. Leaving a page in a potentially corrupted state. [This](https://github.com/kubeapps/kubeapps/issues/632) is an example of such behavior. +Currently, if the application experiences a runtime error, the application stops rendering, but does not notify the user that something went wrong. Leaving a page in a potentially corrupted state. [This](https://github.com/vmware-tanzu/kubeapps/issues/632) is an example of such behavior. This behavior can be confusing, so it would be better to just show the user, "something went wrong, please double check 'foo' and/or create an issue in here..." @@ -135,11 +135,11 @@ In our previous section [1 - Unexpected, unhandled errors](#1---unexpected-unhan This design can be implemented in multiple stages: -- Stage 1: Implement error boundary for unexpected runtime rendering errors, reusing the `UnexpectedError` component. [#724](https://github.com/kubeapps/kubeapps/issues/724). -- Stage 2: Implement an instance of ErrorSelector in the layout connected to the redux store, move a couple of ErrorSelector consumers to this new model [#725](https://github.com/kubeapps/kubeapps/issues/725). -- Stage 3: Finish the migration of all these consumers from rendering the component to dispatch an error and remove those renders [#725](https://github.com/kubeapps/kubeapps/issues/725). -- Stage 4: Change the errorBoundary component to rely on the connected errorSelector implemented in stage 2 and remove its own render [#726](https://github.com/kubeapps/kubeapps/issues/726). -- Stage 5: Look into merging errorBoundary and errorSelector [#727](https://github.com/kubeapps/kubeapps/issues/727). +- Stage 1: Implement error boundary for unexpected runtime rendering errors, reusing the `UnexpectedError` component. [#724](https://github.com/vmware-tanzu/kubeapps/issues/724). +- Stage 2: Implement an instance of ErrorSelector in the layout connected to the redux store, move a couple of ErrorSelector consumers to this new model [#725](https://github.com/vmware-tanzu/kubeapps/issues/725). +- Stage 3: Finish the migration of all these consumers from rendering the component to dispatch an error and remove those renders [#725](https://github.com/vmware-tanzu/kubeapps/issues/725). +- Stage 4: Change the errorBoundary component to rely on the connected errorSelector implemented in stage 2 and remove its own render [#726](https://github.com/vmware-tanzu/kubeapps/issues/726). +- Stage 5: Look into merging errorBoundary and errorSelector [#727](https://github.com/vmware-tanzu/kubeapps/issues/727). My opinion is that in terms of priorities, what we really need in the short term is only Stage 1. The global error handling via Redux mechanism is nice to have but not strictly needed right now because the app is not growing much in terms of new views just yet. diff --git a/docs/reference/design-proposals/replacing-mongodb.md b/docs/reference/design-proposals/replacing-mongodb.md index 541449ff4ce..4d661c256c6 100644 --- a/docs/reference/design-proposals/replacing-mongodb.md +++ b/docs/reference/design-proposals/replacing-mongodb.md @@ -1,6 +1,6 @@ ## Description of the problem -Due the problems described here: https://github.com/kubeapps/kubeapps/issues/651 and licensing issues, MongoDB is no longer the best solution for our use case. Apart from that, even though is not the goal of this document, we are evaluating the possible effort needed to support other type of assets in Kubeapps (apart than charts) like operators. +Due the problems described here: https://github.com/vmware-tanzu/kubeapps/issues/651 and licensing issues, MongoDB is no longer the best solution for our use case. Apart from that, even though is not the goal of this document, we are evaluating the possible effort needed to support other type of assets in Kubeapps (apart than charts) like operators. The two items above, require a re-design of two micro-services: `chartsvc` and `chart-repo`. While the changes should be kept minimal, at least for the moment, we should plan in advance to support new asset types. diff --git a/docs/reference/developer/apprepository-controller.md b/docs/reference/developer/apprepository-controller.md index 2199775bad4..318e8ae0dab 100644 --- a/docs/reference/developer/apprepository-controller.md +++ b/docs/reference/developer/apprepository-controller.md @@ -36,7 +36,7 @@ _Telepresence is not a hard requirement, but is recommended for a better develop ## Download the kubeapps source code ```bash -git clone --recurse-submodules https://github.com/kubeapps/kubeapps $KUBEAPPS_DIR +git clone --recurse-submodules https://github.com/vmware-tanzu/kubeapps $KUBEAPPS_DIR ``` The `apprepository-controller` sources are located under the `cmd/apprepository-controller/` directory of the repository. diff --git a/docs/reference/developer/asset-syncer.md b/docs/reference/developer/asset-syncer.md index c489fa1a0eb..03942d84942 100644 --- a/docs/reference/developer/asset-syncer.md +++ b/docs/reference/developer/asset-syncer.md @@ -15,7 +15,7 @@ The `asset-syncer` component is a tool that scans a Helm chart repository and po ## Download the Kubeapps source code ```bash -git clone https://github.com/kubeapps/kubeapps $KUBEAPPS_DIR +git clone https://github.com/vmware-tanzu/kubeapps $KUBEAPPS_DIR ``` The `asset-syncer` sources are located under the `cmd/asset-syncer/` directory. diff --git a/docs/reference/developer/assetsvc.md b/docs/reference/developer/assetsvc.md index 7f9c29010a0..4e44c3128d3 100644 --- a/docs/reference/developer/assetsvc.md +++ b/docs/reference/developer/assetsvc.md @@ -15,7 +15,7 @@ The `assetsvc` component is a micro-service that creates an API endpoint for acc ## Download the Kubeapps source code ```bash -git clone https://github.com/kubeapps/kubeapps $KUBEAPPS_DIR +git clone https://github.com/vmware-tanzu/kubeapps $KUBEAPPS_DIR ``` The `assetsvc` sources are located under the `cmd/assetsvc/` directory. diff --git a/docs/reference/developer/build.md b/docs/reference/developer/build.md index c7706d95a00..2d7b185a65c 100644 --- a/docs/reference/developer/build.md +++ b/docs/reference/developer/build.md @@ -13,7 +13,7 @@ This guide explains how to build Kubeapps. ## Download kubeapps source code ```bash -git clone --recurse-submodules https://github.com/kubeapps/kubeapps $KUBEAPPS_DIR +git clone --recurse-submodules https://github.com/vmware-tanzu/kubeapps $KUBEAPPS_DIR cd $KUBEAPPS_DIR ``` diff --git a/docs/reference/developer/dashboard.md b/docs/reference/developer/dashboard.md index b949adaaa84..5808fb808c6 100644 --- a/docs/reference/developer/dashboard.md +++ b/docs/reference/developer/dashboard.md @@ -17,7 +17,7 @@ _Telepresence is not a hard requirement, but is recommended for a better develop ## Download the kubeapps source code ```bash -git clone --recurse-submodules https://github.com/kubeapps/kubeapps $KUBEAPPS_DIR +git clone --recurse-submodules https://github.com/vmware-tanzu/kubeapps $KUBEAPPS_DIR ``` The dashboard application source is located under the `dashboard/` directory of the repository. diff --git a/docs/reference/developer/issue-triage-process.md b/docs/reference/developer/issue-triage-process.md index 3b4550cc8ed..d85035a1e15 100644 --- a/docs/reference/developer/issue-triage-process.md +++ b/docs/reference/developer/issue-triage-process.md @@ -2,7 +2,7 @@ ## Kubeapps backlog -Kubeapps keeps a backlog of issues on GitHub submitted both by maintainers and contributors: this backlog comprises bugs, feature requests, and technical debt. If it’s a bug, an idea for a new feature, or something in between, it’s filed as an issue in the [kubeapps issue page](https://github.com/kubeapps/kubeapps/issues) on GitHub. +Kubeapps keeps a backlog of issues on GitHub submitted both by maintainers and contributors: this backlog comprises bugs, feature requests, and technical debt. If it’s a bug, an idea for a new feature, or something in between, it’s filed as an issue in the [kubeapps issue page](https://github.com/vmware-tanzu/kubeapps/issues) on GitHub. There are some special considerations about how the Kubeapps maintainer team manages its backlog on GitHub: - The issue repository is completely open. The maintainer team, along with the entire Kubeapps community, files all feature enhancements, bugs, and potential future work into the open repository. @@ -10,7 +10,7 @@ There are some special considerations about how the Kubeapps maintainer team man ## Kubeapps' triage process -The [kubeapps/kubeapps](https://github.com/kubeapps/kubeapps) issues are triaged by any member of the maintainer team. The triage process is defined with the objective of helping the Kubeapps team during the planning of each iteration so that the selected issues provide the highest added value to the product itself according to the Kubeapps maintainer team capacities. +The [kubeapps/kubeapps](https://github.com/vmware-tanzu/kubeapps) issues are triaged by any member of the maintainer team. The triage process is defined with the objective of helping the Kubeapps team during the planning of each iteration so that the selected issues provide the highest added value to the product itself according to the Kubeapps maintainer team capacities. The triage process should be performed manually for any issue in the Inbox column and will consist of: diff --git a/docs/reference/developer/kubeapps-apis.md b/docs/reference/developer/kubeapps-apis.md index f30f184d4d4..e7c22d02af9 100644 --- a/docs/reference/developer/kubeapps-apis.md +++ b/docs/reference/developer/kubeapps-apis.md @@ -138,7 +138,7 @@ Note that although we don't support its use in anything other than a demo enviro ### Caveats -Although the current Kubeapps UI does indeed benefit from this core client and interacts with the packages from different packaging systems in a uniform way, we still have some exceptions to this. For example, Flux and Carvel require selecting a service account to be associated with the installed package. Rather than the plugin providing additional schema or field data for creating a package ([something we plan to add in the future](https://github.com/kubeapps/kubeapps/issues/4365)), we've currently included the service account field based on the plugin name. +Although the current Kubeapps UI does indeed benefit from this core client and interacts with the packages from different packaging systems in a uniform way, we still have some exceptions to this. For example, Flux and Carvel require selecting a service account to be associated with the installed package. Rather than the plugin providing additional schema or field data for creating a package ([something we plan to add in the future](https://github.com/vmware-tanzu/kubeapps/issues/4365)), we've currently included the service account field based on the plugin name. It's also worth noting that we tried and were unable to include any streaming gRPC calls on the core packages interface. While two separate packages can define the same interface (with the same methods, return types etc.), `grpc-go` generates package-specific types for streamed responses, which makes it impossible for one packages' implementation of a streaming RPC to match another one, such as the core interface. It is not impossible to work around this, but so far we've used streaming responses on other non-packages plugins, such as the resources plugin for reporting on the Kubernetes resources related to an installed package. @@ -186,7 +186,7 @@ for e := range resourceWatcher.ResultChan() { } ``` -See the [`mergeWatchers` function](https://github.com/kubeapps/kubeapps/blob/v2.4.3/cmd/kubeapps-apis/plugins/resources/v1alpha1/server.go#L298-L335) for details of how the channel results are merged, which is itself inspired by the [fan-in example from the go blog](https://go.dev/blog/pipelines). +See the [`mergeWatchers` function](https://github.com/vmware-tanzu/kubeapps/blob/v2.4.3/cmd/kubeapps-apis/plugins/resources/v1alpha1/server.go#L298-L335) for details of how the channel results are merged, which is itself inspired by the [fan-in example from the go blog](https://go.dev/blog/pipelines). The resources plugin doesn't care which packaging system is used behind the scenes, all it needs to know is which packaging plugin is used so that it can verify the Kubernetes references for the installed package. In this way, the Kubeapps dashboard UI can present the Kubernetes resources for an installed package without caring which packaging system is involved. diff --git a/docs/reference/developer/kubeops.md b/docs/reference/developer/kubeops.md index 22ffaabab83..1dc4aae385f 100644 --- a/docs/reference/developer/kubeops.md +++ b/docs/reference/developer/kubeops.md @@ -14,7 +14,7 @@ The `kubeops` component is a micro-service that creates an API endpoint for acce ## Download the Kubeapps source code ```bash -git clone --recurse-submodules https://github.com/kubeapps/kubeapps $KUBEAPPS_DIR +git clone --recurse-submodules https://github.com/vmware-tanzu/kubeapps $KUBEAPPS_DIR ``` The `kubeops` sources are located under `cmd/kubeops/` and use packages from the `pkg` directory. diff --git a/docs/reference/developer/release-process.md b/docs/reference/developer/release-process.md index 6d155b663ba..ebd95d0160d 100644 --- a/docs/reference/developer/release-process.md +++ b/docs/reference/developer/release-process.md @@ -134,7 +134,7 @@ cargo update #### Security and chart sync PRs -Finally, look at the [pull requests](https://github.com/kubeapps/kubeapps/pulls) and ensure there is no PR open by Snyk or `kubeapps-bot` fixing a security issue or bringing upstream chart changes. If so, discuss it with another Kubeapps maintainer and come to a decision on it, trying not to release with a high/medium severity issue. +Finally, look at the [pull requests](https://github.com/vmware-tanzu/kubeapps/pulls) and ensure there is no PR open by Snyk or `kubeapps-bot` fixing a security issue or bringing upstream chart changes. If so, discuss it with another Kubeapps maintainer and come to a decision on it, trying not to release with a high/medium severity issue. > As part of this release process, the dashboard deps _must_ be updated, the golang deps _should_ be updated, the rust deps _should_ be updated and the security check _must_ be performed. @@ -202,7 +202,7 @@ A new tag pushed to the repository will trigger, apart from the usual test and b ## 3 - Complete the GitHub release notes -Once the release job is finished, you will have a pre-populated [draft GitHub release](https://github.com/kubeapps/kubeapps/releases). +Once the release job is finished, you will have a pre-populated [draft GitHub release](https://github.com/vmware-tanzu/kubeapps/releases). You still _must_ add a high-level description with the release highlights. Please take apart those commits just bumping dependencies up; it may prevent important commits from being clearly identified by our users. @@ -234,7 +234,7 @@ helm repo update && helm search repo kubeapps ## 7 - Publish the GitHub release -Once the new version of the [Kubeapps official chart](https://github.com/bitnami/charts/tree/master/bitnami/kubeapps) has been published and the release notes reviewed, you are ready to publish the release by clicking on the _publish_ button in the [GitHub releases page](https://github.com/kubeapps/kubeapps/releases). +Once the new version of the [Kubeapps official chart](https://github.com/bitnami/charts/tree/master/bitnami/kubeapps) has been published and the release notes reviewed, you are ready to publish the release by clicking on the _publish_ button in the [GitHub releases page](https://github.com/vmware-tanzu/kubeapps/releases). > Take into account that the chart version will be eventually published as part of the usual Bitnami release cycle. So expect this step to take a certain amount of time. diff --git a/docs/reference/developer/using-makefiles.md b/docs/reference/developer/using-makefiles.md index 4cdfdfe1fb5..d058a3b7fe5 100644 --- a/docs/reference/developer/using-makefiles.md +++ b/docs/reference/developer/using-makefiles.md @@ -1,13 +1,13 @@ # How to set up the environment using the provided makefile targets -The main file is [Makefile](https://github.com/kubeapps/kubeapps/blob/main/Makefile), which will compile and prepare the production assets for then generating a set of Docker images. It is the starting point when you want to build the Kubeapps different components. +The main file is [Makefile](https://github.com/vmware-tanzu/kubeapps/blob/main/Makefile), which will compile and prepare the production assets for then generating a set of Docker images. It is the starting point when you want to build the Kubeapps different components. For setting up the environment for running Kubeapps, we also provide (as is) makefile targets for: -- Creating a multicluster environment with Kind ([cluster-kind.mk](https://github.com/kubeapps/kubeapps/blob/main/script/makefiles/cluster-kind.mk)) -- Deploying and configuring the components for getting Kubeapps running with OIDC login using Dex ([deploy-dev.mk](https://github.com/kubeapps/kubeapps/blob/main/script/makefiles/deploy-dev.mk)). +- Creating a multicluster environment with Kind ([cluster-kind.mk](https://github.com/vmware-tanzu/kubeapps/blob/main/script/makefiles/cluster-kind.mk)) +- Deploying and configuring the components for getting Kubeapps running with OIDC login using Dex ([deploy-dev.mk](https://github.com/vmware-tanzu/kubeapps/blob/main/script/makefiles/deploy-dev.mk)). -> Disclaimer: these files are not being actively maintained, as they are solely intended for helping Kubeapp developers to set up the environment. If you are a contributor and you are having troubles, please feel free to [open an issue](https://github.com/kubeapps/kubeapps/issues/new). +> Disclaimer: these files are not being actively maintained, as they are solely intended for helping Kubeapp developers to set up the environment. If you are a contributor and you are having troubles, please feel free to [open an issue](https://github.com/vmware-tanzu/kubeapps/issues/new). ## Makefile for generating images diff --git a/docs/reference/testing/ci.md b/docs/reference/testing/ci.md index 116b0f5d29e..3c8b39910c9 100644 --- a/docs/reference/testing/ci.md +++ b/docs/reference/testing/ci.md @@ -64,7 +64,7 @@ This step is only run once, and it is very unlikely to change. However, it is im ```bash # COPY THIS CONTENT TO GITHUB (with write access): -## https://github.com/kubeapps/kubeapps/settings/keys +## https://github.com/vmware-tanzu/kubeapps/settings/keys ssh-keygen -t ed25519 -C "tanzu-kubeapps-team@vmware.com" -q -N "" -f circleci-kubeapps-deploymentkey echo "Kubeapps deployment key (public)" cat circleci-kubeapps-deploymentkey.pub diff --git a/docs/reference/translations/translate-kubeapps.md b/docs/reference/translations/translate-kubeapps.md index c5d1e42c697..4af8e0bd7aa 100644 --- a/docs/reference/translations/translate-kubeapps.md +++ b/docs/reference/translations/translate-kubeapps.md @@ -1,6 +1,6 @@ # How to translate Kubeapps -> Important: this is a _work in progress_ feature. See the current progress at https://github.com/kubeapps/kubeapps/issues/2346: +> Important: this is a _work in progress_ feature. See the current progress at https://github.com/vmware-tanzu/kubeapps/issues/2346: There are two ways to have Kubeapps with different messages: i) customizing the strings at runtime from the `values.yaml` file; ii) adding a new official translation into the Kubeapps project. diff --git a/docs/tutorials/getting-started.md b/docs/tutorials/getting-started.md index 45980079ff9..46e95f546e3 100644 --- a/docs/tutorials/getting-started.md +++ b/docs/tutorials/getting-started.md @@ -18,7 +18,7 @@ kubectl create namespace kubeapps helm install kubeapps --namespace kubeapps bitnami/kubeapps ``` -For detailed information on installing, configuring and upgrading Kubeapps, checkout the [chart README](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps). +For detailed information on installing, configuring and upgrading Kubeapps, checkout the [chart README](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps). The above commands will deploy Kubeapps into the `kubeapps` namespace in your cluster. It may take a few minutes to run. Once it has been deployed and the Kubeapps pods are running, continue to step 2. @@ -89,7 +89,7 @@ Paste the token generated in the previous step to authenticate and access the Ku ![Dashboard main page](../img/dashboard-home.png) -**_Note:_** If you are setting up Kubeapps for other people to access, you will want to use a different service type or setup Ingress rather than using the above `kubectl port-forward`. For detailed information on installing, configuring and upgrading Kubeapps, checkout the [chart README](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps) +**_Note:_** If you are setting up Kubeapps for other people to access, you will want to use a different service type or setup Ingress rather than using the above `kubectl port-forward`. For detailed information on installing, configuring and upgrading Kubeapps, checkout the [chart README](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps) ## Step 4: Deploy WordPress @@ -131,8 +131,8 @@ If you want to uninstall/delete your WordPress application, you can do so by cli Learn more about Kubeapps with the links below: -- [Detailed installation instructions](https://github.com/kubeapps/kubeapps/blob/main/chart/kubeapps/README.md) +- [Detailed installation instructions](https://github.com/vmware-tanzu/kubeapps/blob/main/chart/kubeapps/README.md) - [Deploying Operators](./operators.md) - [Kubeapps Dashboard documentation](./dashboard.md) -- [Project board](https://github.com/kubeapps/kubeapps/projects/11) -- [Roadmap](https://github.com/kubeapps/kubeapps/milestones) +- [Project board](https://github.com/vmware-tanzu/kubeapps/projects/11) +- [Roadmap](https://github.com/vmware-tanzu/kubeapps/milestones) diff --git a/docs/tutorials/kubeapps-on-tkg/conclusion.md b/docs/tutorials/kubeapps-on-tkg/conclusion.md index bc8900f182a..2771f4e9d5b 100644 --- a/docs/tutorials/kubeapps-on-tkg/conclusion.md +++ b/docs/tutorials/kubeapps-on-tkg/conclusion.md @@ -13,7 +13,7 @@ This guide walked you through the process of configuring, deploying and using Ku At the end of this guide, you should have everything you need to begin using Kubeapps productively on a VMware Tanzu™ Kubernetes Grid™ cluster. -In case of difficulties, reach out to the developers at [#kubeapps on Kubernetes Slack](https://kubernetes.slack.com/messages/kubeapps) (click [here](http://slack.k8s.io) to sign up). You can also [open a GitHub issue](https://github.com/kubeapps/kubeapps/issues/new) to report problems or bugs. +In case of difficulties, reach out to the developers at [#kubeapps on Kubernetes Slack](https://kubernetes.slack.com/messages/kubeapps) (click [here](http://slack.k8s.io) to sign up). You can also [open a GitHub issue](https://github.com/vmware-tanzu/kubeapps/issues/new) to report problems or bugs. ## Useful Links @@ -22,32 +22,32 @@ Learn more about the topics discussed in this guide using the links below. ### Background and Context - [Enabling Identity Management in VMware Tanzu™ Kubernetes Grid™](https://docs.vmware.com/en/VMware-Tanzu-Kubernetes-Grid/1.3/vmware-tanzu-kubernetes-grid-13/GUID-mgmt-clusters-enabling-id-mgmt.html) -- [Installing Kubeapps in air-gapped environments](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/offline-installation.md) -- [Syncing app repositories using webhooks](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/syncing-apprepository-webhook.md) -- [Using Kubeapps to deploy in multiple clusters](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/deploying-to-multiple-clusters.md) -- [Using Operators in Kubeapps](https://github.com/kubeapps/kubeapps/blob/main/docs/tutorials/operators.md) +- [Installing Kubeapps in air-gapped environments](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/offline-installation.md) +- [Syncing app repositories using webhooks](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/syncing-apprepository-webhook.md) +- [Using Kubeapps to deploy in multiple clusters](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/deploying-to-multiple-clusters.md) +- [Using Operators in Kubeapps](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/tutorials/operators.md) ### Step 1: Configure an Identity Management Provider in the Cluster -- [Using an OAuth2/OIDC provider](https://github.com/kubeapps/kubeapps/blob/main/docs/tutorials/using-an-OIDC-provider.md) -- [VMware Cloud Services as OIDC provider](https://github.com/kubeapps/kubeapps/blob/main/docs/tutorials/using-an-OIDC-provider.md#vmware-cloud-services) -- [Using an OIDC provider with Pinniped](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md) +- [Using an OAuth2/OIDC provider](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/tutorials/using-an-OIDC-provider.md) +- [VMware Cloud Services as OIDC provider](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/tutorials/using-an-OIDC-provider.md#vmware-cloud-services) +- [Using an OIDC provider with Pinniped](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md) - [JWTAuthenticator](https://pinniped.dev/docs/howto/configure-concierge-jwt/). ### Step 2: Configure and Install Kubeapps - [Using values.yaml files in Helm Charts](https://helm.sh/docs/chart_template_guide/values_files/) -- [Configure Pinniped to trust the OIDC provider](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md#configure-pinniped-to-trust-your-oidc-identity-provider) -- [Configuring Kubeapps to proxy requests via Pinniped](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md#configuring-kubeapps-to-proxy-requests-via-pinniped) -- [Getting started with Kubeapps](https://github.com/kubeapps/kubeapps/blob/main/docs/tutorials/getting-started.md) -- [Adding new translations in Kubeapps](https://github.com/kubeapps/kubeapps/blob/main/docs/reference/translations/translate-kubeapps.md) +- [Configure Pinniped to trust the OIDC provider](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md#configure-pinniped-to-trust-your-oidc-identity-provider) +- [Configuring Kubeapps to proxy requests via Pinniped](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md#configuring-kubeapps-to-proxy-requests-via-pinniped) +- [Getting started with Kubeapps](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/tutorials/getting-started.md) +- [Adding new translations in Kubeapps](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/reference/translations/translate-kubeapps.md) ### Step 3: Add Application Repositories to Kubeapps -- [Adding an public application repository](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/dashboard.md) +- [Adding an public application repository](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/dashboard.md) - [Consume Tanzu™ Application Catalog™ Helm Charts using Kubeapps](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tac-docs/GUID-using-tac-consume-tac-kubeapps.html) -- [Adding an private application repository](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/private-app-repository.md) +- [Adding an private application repository](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/private-app-repository.md) ### Step 4: Deploy and Manage Applications with Kubeapps -- [Using the Kubeapps Dashboard](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/dashboard.md) +- [Using the Kubeapps Dashboard](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/dashboard.md) diff --git a/docs/tutorials/kubeapps-on-tkg/step-1.md b/docs/tutorials/kubeapps-on-tkg/step-1.md index 5f3ec6ccf13..842d23a8083 100644 --- a/docs/tutorials/kubeapps-on-tkg/step-1.md +++ b/docs/tutorials/kubeapps-on-tkg/step-1.md @@ -79,7 +79,7 @@ spec: The `name` field specifies the name of the _JWTAuthenticator_ resource, which will be required in the next step. -> **NOTE**: Ignore the `tls` section of the configuration shown above unless the OIDC uses a self-signed certificate. If it does, follow [these additional steps](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md#pinniped-not-trusting-your-oidc-provider). +> **NOTE**: Ignore the `tls` section of the configuration shown above unless the OIDC uses a self-signed certificate. If it does, follow [these additional steps](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/OIDC/using-an-OIDC-provider-with-pinniped.md#pinniped-not-trusting-your-oidc-provider). > **NOTE**: Just if you are using the Pinniped version provided by TMC (instead of the one already provided by TKG), the line `namespace: pinniped-concierge` must be removed. diff --git a/docs/tutorials/kubeapps-on-tkg/step-2.md b/docs/tutorials/kubeapps-on-tkg/step-2.md index ed87613f554..042b7c3cb53 100644 --- a/docs/tutorials/kubeapps-on-tkg/step-2.md +++ b/docs/tutorials/kubeapps-on-tkg/step-2.md @@ -56,7 +56,7 @@ Key user interface parameters are: The first step is to configure the `clusters`, `pinnipedProxy` and `authProxy` parameters to reflect the work done in [Step 1](./step-1.md). These parameters are discussed below: -1. Declare that the target cluster is using Pinniped by setting the parameter `pinnipedConfig.enabled=true`. If using multiple target clusters, please refer to the [Deploying to Multiple Clusters](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/deploying-to-multiple-clusters.md) guide. Here is an example: +1. Declare that the target cluster is using Pinniped by setting the parameter `pinnipedConfig.enabled=true`. If using multiple target clusters, please refer to the [Deploying to Multiple Clusters](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/deploying-to-multiple-clusters.md) guide. Here is an example: > **TIP**: Since the target cluster is the same as the cluster on which Kubeapps is installed, there is no need to set a URL. Note that the `name` field is used only to configure a display name in the Kubeapps dashboard. @@ -131,7 +131,7 @@ The next step is to provide a rich user experience, aligned with corporate brand login-oidc: Login via VMware Cloud Services ``` - > **TIP**: See the [complete list of customizable strings](https://github.com/kubeapps/kubeapps/blob/main/dashboard/lang/en.json). + > **TIP**: See the [complete list of customizable strings](https://github.com/vmware-tanzu/kubeapps/blob/main/dashboard/lang/en.json). In a similar manner, add custom style rules using custom CSS selectors. For example, to change the Kubeapps logo, set the selector `.kubeapps-logo` to the property `background-image: url('data:image/png;base64...')` as shown in the example below. The long string shown is the Base64-encoded data for the new logo image. @@ -164,9 +164,9 @@ At this point, Kubeapps is configured to use a custom interface. With the configuration out of the way, it's time to install Kubeapps. Since Kubeapps is currently officially delivered as a [Helm chart packaged by Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/kubeapps), the easiest way to install Kubeapps is to add the Bitnami repository to Helm and install it via Helm. -In case Kubeapps is to be installed in an air-gapped environment, please follow the [offline installation instructions](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/offline-installation.md) instead. +In case Kubeapps is to be installed in an air-gapped environment, please follow the [offline installation instructions](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/offline-installation.md) instead. -> **TIP**: Typically, the Kubeapps dashboard is set as externally accessible, either by setting the parameter `frontend.service.type=LoadBalancer` (as shown below) or by using an Ingress controller. Please refer to [the Kubeapps documentation covering external access](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps#exposing-externally) for additional information. +> **TIP**: Typically, the Kubeapps dashboard is set as externally accessible, either by setting the parameter `frontend.service.type=LoadBalancer` (as shown below) or by using an Ingress controller. Please refer to [the Kubeapps documentation covering external access](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps#exposing-externally) for additional information. > > ```yaml > frontend: @@ -191,7 +191,7 @@ Finally, remember to replace the placeholder _Redirect URIs_ you entered when [c For instance, assuming Kubeapps is accessible at `https://kubeapps.example.com` replace `https://localhost/oauth2/callback` with `https://kubeapps.example.com/oauth2/callback`. -> **TIP**: If you are serving Kubeapps from a subpath, for instance, `https://example.com/kubeapps`, you will need to slightly modify the `authProxy` configuration. Please follow [these instructions](https://github.com/kubeapps/kubeapps/blob/main/chart/kubeapps/README.md#serving-kubeapps-in-a-subpath) for further details. +> **TIP**: If you are serving Kubeapps from a subpath, for instance, `https://example.com/kubeapps`, you will need to slightly modify the `authProxy` configuration. Please follow [these instructions](https://github.com/vmware-tanzu/kubeapps/blob/main/chart/kubeapps/README.md#serving-kubeapps-in-a-subpath) for further details. ![Add name and description](./img/csp-oauth-redirect.png) @@ -199,7 +199,7 @@ At this point, Kubeapps is installed in the cluster and the OIDC provider is ful ### Step 2.4: Configure Role-Based Access -Once Kubeapps is installed, the next step is to configure access. Since Kubeapps delegates authorization to the existing Role-Based Access Control (RBAC) configured in the cluster, every permission should be granted using `ClusterRoleBinding` and `RoleBinding` objects. Please refer to the official documentation about [Kubeapps access control](https://github.com/kubeapps/kubeapps/blob/main/docs/howto/access-control.md) for more information. +Once Kubeapps is installed, the next step is to configure access. Since Kubeapps delegates authorization to the existing Role-Based Access Control (RBAC) configured in the cluster, every permission should be granted using `ClusterRoleBinding` and `RoleBinding` objects. Please refer to the official documentation about [Kubeapps access control](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/howto/access-control.md) for more information. > **NOTE**: RBAC configuration depends on your custom business requirements. The configuration shown below is only an example and not meant for production use. Please refer to the official [Kubernetes RBAC documentation](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) for more details. @@ -233,7 +233,7 @@ At this point, the user having `EMAIL-ADDRESS` email account will have `cluster- Once Kubeapps is installed and configured, the next step is to log in and access the Kubeapps Web dashboard. The procedure to do this depends on how Kubeapps was configured. -1. If [the service was exposed externally](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps#exposing-externally), it may be accessed using a public IP address; if not, it can be accessed locally by forwarding the cluster port using the command below: +1. If [the service was exposed externally](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps#exposing-externally), it may be accessed using a public IP address; if not, it can be accessed locally by forwarding the cluster port using the command below: ```bash kubectl port-forward -n kubeapps svc/kubeapps 8080:80 diff --git a/docs/tutorials/managing-carvel-packages.md b/docs/tutorials/managing-carvel-packages.md index 8e0fc01fe24..77e0ac734b9 100644 --- a/docs/tutorials/managing-carvel-packages.md +++ b/docs/tutorials/managing-carvel-packages.md @@ -112,7 +112,7 @@ kubeappsapis: > **NOTE**: Currently, Kubeapps does not offer any graphical way to manage [Carvel Packages Repositories](https://carvel.dev/kapp-controller/docs/latest/packaging/#package-repository). Therefore, you will need to install the package repository manually. -Since we are actively working on [refactor the Application Repository management in Kubeapps](https://github.com/kubeapps/kubeapps/projects/11?card_filter_query=milestone%3A%22app+repository+refactor%22), [Carvel Packages Repositories](https://carvel.dev/kapp-controller/docs/latest/packaging/#package-repository) cannot be currently managed by Kubeapps. +Since we are actively working on [refactor the Application Repository management in Kubeapps](https://github.com/vmware-tanzu/kubeapps/projects/11?card_filter_query=milestone%3A%22app+repository+refactor%22), [Carvel Packages Repositories](https://carvel.dev/kapp-controller/docs/latest/packaging/#package-repository) cannot be currently managed by Kubeapps. This section covers how to manage repositories manually. First, you need to find a Carvel Package Repository already published. If not, you can always [create your own manually](https://carvel.dev/kapp-controller/docs/latest/packaging-tutorial/#creating-a-package-repository). @@ -282,4 +282,4 @@ Some additional resources and references include: - [Getting Started with kapp](https://tanzu.vmware.com/developer/guides/kapp-gs/) - [kapp documentation](https://carvel.dev/kapp/docs/latest) -Finally, we are [currently working](https://github.com/kubeapps/kubeapps/projects/11?card_filter_query=milestone%3A%22pluggable+support+for+carvel%22) on this kapp-controller plugin for managing Carvel Packages, so if you encounter any problems, please [file an issue](https://github.com/kubeapps/kubeapps/issues/new) in the Kubeapps repository. +Finally, we are [currently working](https://github.com/vmware-tanzu/kubeapps/projects/11?card_filter_query=milestone%3A%22pluggable+support+for+carvel%22) on this kapp-controller plugin for managing Carvel Packages, so if you encounter any problems, please [file an issue](https://github.com/vmware-tanzu/kubeapps/issues/new) in the Kubeapps repository. diff --git a/docs/tutorials/managing-flux-packages.md b/docs/tutorials/managing-flux-packages.md index c49898f5c9e..1b21a960caa 100644 --- a/docs/tutorials/managing-flux-packages.md +++ b/docs/tutorials/managing-flux-packages.md @@ -207,4 +207,4 @@ Some additional resources and references include: - [Getting Started with Flux](https://fluxcd.io/docs/get-started/) -Finally, we are [currently working](https://github.com/kubeapps/kubeapps/milestone/17) on this Flux plugin for managing Flux Packages, so if you encounter any problems, please [file an issue](https://github.com/kubeapps/kubeapps/issues/new) in the Kubeapps repository. +Finally, we are [currently working](https://github.com/vmware-tanzu/kubeapps/milestone/17) on this Flux plugin for managing Flux Packages, so if you encounter any problems, please [file an issue](https://github.com/vmware-tanzu/kubeapps/issues/new) in the Kubeapps repository. diff --git a/docs/tutorials/operators.md b/docs/tutorials/operators.md index 4248c55026b..2f1f5131a34 100644 --- a/docs/tutorials/operators.md +++ b/docs/tutorials/operators.md @@ -77,4 +77,4 @@ You can also click in the Update button to modify the instance or in the Delete ## Step 5: Provide Feedback -We need your feedback to improve this integration! If you find any issue or have a suggestion please [open an issue in GitHub](https://github.com/kubeapps/kubeapps/issues/new) or contact us in the [#kubeapps](https://kubernetes.slack.com/messages/kubeapps) channel in Slack. +We need your feedback to improve this integration! If you find any issue or have a suggestion please [open an issue in GitHub](https://github.com/vmware-tanzu/kubeapps/issues/new) or contact us in the [#kubeapps](https://kubernetes.slack.com/messages/kubeapps) channel in Slack. diff --git a/go.mod b/go.mod index 7e3ac55735c..782a8b75abc 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ // Copyright 2019-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -module github.com/kubeapps/kubeapps +module github.com/vmware-tanzu/kubeapps go 1.17 diff --git a/pkg/agent/agent_test.go b/pkg/agent/agent_test.go index 57aaa728669..cacde140e2d 100644 --- a/pkg/agent/agent_test.go +++ b/pkg/agent/agent_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - kubechart "github.com/kubeapps/kubeapps/pkg/chart" - chartFake "github.com/kubeapps/kubeapps/pkg/chart/fake" + kubechart "github.com/vmware-tanzu/kubeapps/pkg/chart" + chartFake "github.com/vmware-tanzu/kubeapps/pkg/chart/fake" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" diff --git a/pkg/agent/httpConfigForCluster.go b/pkg/agent/httpConfigForCluster.go index 170d0aa1ed9..3faff17d3f5 100644 --- a/pkg/agent/httpConfigForCluster.go +++ b/pkg/agent/httpConfigForCluster.go @@ -27,7 +27,7 @@ import ( // // TODO(mnelson) The better short-term option is to update pinniped-proxy to support TLS // even though it's for internal traffic only, as it will be required in many circumstances. -// https://github.com/kubeapps/kubeapps/issues/2268 +// https://github.com/vmware-tanzu/kubeapps/issues/2268 // This implementation can be completely removed once TLS is used by pinniped-proxy. type configForCluster struct { config *rest.Config diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 979c118b153..5bd626ab5bf 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -9,8 +9,8 @@ import ( "regexp" "strings" - "github.com/kubeapps/kubeapps/pkg/kube" - yamlUtils "github.com/kubeapps/kubeapps/pkg/yaml" + "github.com/vmware-tanzu/kubeapps/pkg/kube" + yamlUtils "github.com/vmware-tanzu/kubeapps/pkg/yaml" authorizationapi "k8s.io/api/authorization/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/auth/authgate.go b/pkg/auth/authgate.go index 18858df038b..ed4f10c849e 100644 --- a/pkg/auth/authgate.go +++ b/pkg/auth/authgate.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/kubeapps/kubeapps/pkg/dbutils" - "github.com/kubeapps/kubeapps/pkg/kube" - "github.com/kubeapps/kubeapps/pkg/response" negroni "github.com/urfave/negroni/v2" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/pkg/response" ) // tokenPrefix is the string preceding the token in the Authorization header. diff --git a/pkg/auth/fake/auth.go b/pkg/auth/fake/auth.go index 147b5fa80e9..734c5b8d21a 100644 --- a/pkg/auth/fake/auth.go +++ b/pkg/auth/fake/auth.go @@ -4,7 +4,7 @@ package fake import ( - authUtils "github.com/kubeapps/kubeapps/pkg/auth" + authUtils "github.com/vmware-tanzu/kubeapps/pkg/auth" ) type FakeAuth struct { diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go index 5ada3653ac5..11f6f9f88a3 100644 --- a/pkg/chart/chart.go +++ b/pkg/chart/chart.go @@ -16,10 +16,10 @@ import ( "strings" "github.com/containerd/containerd/remotes/docker" - appRepov1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/helm" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" - "github.com/kubeapps/kubeapps/pkg/kube" + appRepov1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/helm" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/pkg/kube" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/repo" @@ -140,7 +140,7 @@ func checksum(data []byte) string { } // Cache the result of parsing the repo index since parsing this YAML -// is an expensive operation. See https://github.com/kubeapps/kubeapps/issues/1052 +// is an expensive operation. See https://github.com/vmware-tanzu/kubeapps/issues/1052 // TODO(agamez): remove this method once it is no longer used in kubeops func getIndexFromCache(repoURL string, data []byte) (*repo.IndexFile, string) { sha := checksum(data) diff --git a/pkg/chart/chart_test.go b/pkg/chart/chart_test.go index 9f09cbf5312..31b2f407d3f 100644 --- a/pkg/chart/chart_test.go +++ b/pkg/chart/chart_test.go @@ -19,12 +19,12 @@ import ( "github.com/google/go-cmp/cmp" - appRepov1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - helmfake "github.com/kubeapps/kubeapps/pkg/helm/fake" - helmtest "github.com/kubeapps/kubeapps/pkg/helm/test" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" - "github.com/kubeapps/kubeapps/pkg/kube" "github.com/stretchr/testify/assert" + appRepov1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + helmfake "github.com/vmware-tanzu/kubeapps/pkg/helm/fake" + helmtest "github.com/vmware-tanzu/kubeapps/pkg/helm/test" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/pkg/kube" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/repo" corev1 "k8s.io/api/core/v1" diff --git a/pkg/chart/fake/chart.go b/pkg/chart/fake/chart.go index 33d6ad22706..e005347d3c3 100644 --- a/pkg/chart/fake/chart.go +++ b/pkg/chart/fake/chart.go @@ -4,8 +4,8 @@ package fake import ( - appRepov1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - chartUtils "github.com/kubeapps/kubeapps/pkg/chart" + appRepov1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + chartUtils "github.com/vmware-tanzu/kubeapps/pkg/chart" "helm.sh/helm/v3/pkg/chart" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" diff --git a/pkg/dbutils/dbutilstest/pgtest/pgtest.go b/pkg/dbutils/dbutilstest/pgtest/pgtest.go index d2563e93abb..5b885613043 100644 --- a/pkg/dbutils/dbutilstest/pgtest/pgtest.go +++ b/pkg/dbutils/dbutilstest/pgtest/pgtest.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - "github.com/kubeapps/kubeapps/pkg/chart/models" - "github.com/kubeapps/kubeapps/pkg/dbutils" - "github.com/kubeapps/kubeapps/pkg/dbutils/dbutilstest" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils" + "github.com/vmware-tanzu/kubeapps/pkg/dbutils/dbutilstest" ) const ( diff --git a/pkg/dbutils/postgresql_utils.go b/pkg/dbutils/postgresql_utils.go index cd98beb9f94..29abfa55427 100644 --- a/pkg/dbutils/postgresql_utils.go +++ b/pkg/dbutils/postgresql_utils.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/kubeapps/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" ) const ( diff --git a/pkg/dbutils/postgresql_utils_test.go b/pkg/dbutils/postgresql_utils_test.go index bf6bcd16860..d4fe6778239 100644 --- a/pkg/dbutils/postgresql_utils_test.go +++ b/pkg/dbutils/postgresql_utils_test.go @@ -8,7 +8,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/google/go-cmp/cmp" - "github.com/kubeapps/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" ) func Test_NewPGManager(t *testing.T) { diff --git a/pkg/handlerutil/handlerutil.go b/pkg/handlerutil/handlerutil.go index 60897858fd8..bb02b0388c7 100644 --- a/pkg/handlerutil/handlerutil.go +++ b/pkg/handlerutil/handlerutil.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/gorilla/mux" - appRepov1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - chartUtils "github.com/kubeapps/kubeapps/pkg/chart" + appRepov1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + chartUtils "github.com/vmware-tanzu/kubeapps/pkg/chart" "helm.sh/helm/v3/pkg/chart" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index abca16aea0b..edd50c61780 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -37,7 +37,7 @@ type ( // use the Helm code a library instead // More information: // // https://github.com/helm/helm/issues/10623 -// // https://github.com/kubeapps/kubeapps/pull/4154 +// // https://github.com/vmware-tanzu/kubeapps/pull/4154 // // This function has been slightly adapted from: // https://github.com/helm/helm/blob/v3.8.0/pkg/registry/client.go#L249 @@ -112,7 +112,7 @@ func (p *OCIPuller) PullOCIChart(ref string) (*bytes.Buffer, string, error) { // use the Helm code a library instead // More information: // // https://github.com/helm/helm/issues/10623 -// // https://github.com/kubeapps/kubeapps/pull/4154 +// // https://github.com/vmware-tanzu/kubeapps/pull/4154 // // https://github.com/helm/helm/blob/v3.8.0/pkg/registry/util.go#L112 func parseReference(raw string) (registry.Reference, error) { diff --git a/pkg/helm/index.go b/pkg/helm/index.go index 7b82195b690..5c120482584 100644 --- a/pkg/helm/index.go +++ b/pkg/helm/index.go @@ -9,7 +9,7 @@ import ( "sort" "github.com/jinzhu/copier" - "github.com/kubeapps/kubeapps/pkg/chart/models" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" "helm.sh/helm/v3/pkg/repo" log "k8s.io/klog/v2" "sigs.k8s.io/yaml" diff --git a/pkg/helm/index_test.go b/pkg/helm/index_test.go index d5429948d78..b152096c83f 100644 --- a/pkg/helm/index_test.go +++ b/pkg/helm/index_test.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "testing" - "github.com/kubeapps/kubeapps/pkg/chart/models" "github.com/stretchr/testify/assert" + "github.com/vmware-tanzu/kubeapps/pkg/chart/models" ) var validRepoIndexYAMLBytes, _ = ioutil.ReadFile("testdata/valid-index.yaml") diff --git a/pkg/helm/test/utils.go b/pkg/helm/test/utils.go index 9d7898b7b43..5bc9bee0d6d 100644 --- a/pkg/helm/test/utils.go +++ b/pkg/helm/test/utils.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/kubeapps/kubeapps/pkg/helm" + "github.com/vmware-tanzu/kubeapps/pkg/helm" ) // CheckHeader verifies that the given puller contains the given header diff --git a/pkg/http-handler/http-handler.go b/pkg/http-handler/http-handler.go index 3633bf72713..7c91feb5d21 100644 --- a/pkg/http-handler/http-handler.go +++ b/pkg/http-handler/http-handler.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - "github.com/kubeapps/kubeapps/pkg/auth" - "github.com/kubeapps/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + "github.com/vmware-tanzu/kubeapps/pkg/auth" + "github.com/vmware-tanzu/kubeapps/pkg/kube" corev1 "k8s.io/api/core/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/http-handler/http-handler_test.go b/pkg/http-handler/http-handler_test.go index 5a4b49f2b51..c8f74c4c35c 100644 --- a/pkg/http-handler/http-handler_test.go +++ b/pkg/http-handler/http-handler_test.go @@ -15,13 +15,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/gorilla/mux" - "github.com/kubeapps/kubeapps/pkg/kube" + "github.com/vmware-tanzu/kubeapps/pkg/kube" corev1 "k8s.io/api/core/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" ) func checkAppResponse(t *testing.T, response *httptest.ResponseRecorder, expectedResponse appRepositoryResponse) { diff --git a/pkg/kube/fake.go b/pkg/kube/fake.go index 693ff1d3f19..8e0eb9d8e6b 100644 --- a/pkg/kube/fake.go +++ b/pkg/kube/fake.go @@ -6,7 +6,7 @@ package kube import ( "io" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" authorizationapi "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/kube/kube_handler.go b/pkg/kube/kube_handler.go index 8484cae6109..5a34b0e1694 100644 --- a/pkg/kube/kube_handler.go +++ b/pkg/kube/kube_handler.go @@ -19,10 +19,10 @@ import ( "strings" "sync" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - apprepoclientset "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" - v1alpha1typed "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + apprepoclientset "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned" + v1alpha1typed "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/typed/apprepository/v1alpha1" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" authorizationapi "k8s.io/api/authorization/v1" corev1 "k8s.io/api/core/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/kube/kube_handler_test.go b/pkg/kube/kube_handler_test.go index 750a4cf8247..c9a51bb3fa2 100644 --- a/pkg/kube/kube_handler_test.go +++ b/pkg/kube/kube_handler_test.go @@ -33,9 +33,9 @@ import ( fakeRest "k8s.io/client-go/rest/fake" k8stesting "k8s.io/client-go/testing" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - fakeapprepoclientset "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/fake" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + fakeapprepoclientset "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/client/clientset/versioned/fake" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" ) type repoStub struct { diff --git a/pkg/kube/kube_utils.go b/pkg/kube/kube_utils.go index 0ac529ec252..9bcd9e9fd79 100644 --- a/pkg/kube/kube_utils.go +++ b/pkg/kube/kube_utils.go @@ -11,8 +11,8 @@ import ( "net/http" "net/url" - "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "golang.org/x/net/http/httpproxy" corev1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/credentialprovider" diff --git a/pkg/kube/kube_utils_test.go b/pkg/kube/kube_utils_test.go index 43ab5d8b3e2..6660d2dce23 100644 --- a/pkg/kube/kube_utils_test.go +++ b/pkg/kube/kube_utils_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - v1alpha1 "github.com/kubeapps/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + v1alpha1 "github.com/vmware-tanzu/kubeapps/cmd/apprepository-controller/pkg/apis/apprepository/v1alpha1" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" "golang.org/x/net/http/httpproxy" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/tarutil/tarutil.go b/pkg/tarutil/tarutil.go index 937a56c1459..4de21eed3e1 100644 --- a/pkg/tarutil/tarutil.go +++ b/pkg/tarutil/tarutil.go @@ -12,8 +12,8 @@ import ( "path" "strings" - chart "github.com/kubeapps/kubeapps/pkg/chart/models" - httpclient "github.com/kubeapps/kubeapps/pkg/http-client" + chart "github.com/vmware-tanzu/kubeapps/pkg/chart/models" + httpclient "github.com/vmware-tanzu/kubeapps/pkg/http-client" ) // diff --git a/pkg/tarutil/tarutil_test.go b/pkg/tarutil/tarutil_test.go index bb9147a0fbb..9489f490641 100644 --- a/pkg/tarutil/tarutil_test.go +++ b/pkg/tarutil/tarutil_test.go @@ -10,8 +10,8 @@ import ( "io" "testing" - "github.com/kubeapps/kubeapps/pkg/tarutil/test" "github.com/stretchr/testify/assert" + "github.com/vmware-tanzu/kubeapps/pkg/tarutil/test" ) func Test_extractFilesFromTarball(t *testing.T) { diff --git a/script/chart_sync_utils.sh b/script/chart_sync_utils.sh index cf20da58780..a1fe3936569 100755 --- a/script/chart_sync_utils.sh +++ b/script/chart_sync_utils.sh @@ -14,7 +14,7 @@ PROJECT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd) CHART_REPO_PATH="bitnami/kubeapps" # Path of the Kubeapps chart in the Kubeapps repo. -# For instance, given "https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps", it should be "chart/kubeapps" +# For instance, given "https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps", it should be "chart/kubeapps" KUBEAPPS_CHART_DIR="${PROJECT_DIR}/chart/kubeapps" # Paths of the templates files, note they are also used elsewhere diff --git a/script/e2e-test.sh b/script/e2e-test.sh index 08206253247..157631584f2 100755 --- a/script/e2e-test.sh +++ b/script/e2e-test.sh @@ -160,7 +160,7 @@ pushChart() { # name: kubeapps-apache # description: foo apache chart for CI # consequently, the new packaged chart is "${prefix}${chart}-${version}.tgz" - # This workaround should mitigate https://github.com/kubeapps/kubeapps/issues/3339 + # This workaround should mitigate https://github.com/vmware-tanzu/kubeapps/issues/3339 mkdir ./${chart}-${version} tar zxf ${chart}-${version}.tgz -C ./${chart}-${version} sed -i "s/name: ${chart}/name: ${prefix}${chart}/" ./${chart}-${version}/${chart}/Chart.yaml diff --git a/script/tpl/PR_external_chart_template.md b/script/tpl/PR_external_chart_template.md index 863d4bcaa73..4348ce03e3d 100644 --- a/script/tpl/PR_external_chart_template.md +++ b/script/tpl/PR_external_chart_template.md @@ -2,7 +2,7 @@ Signed-off-by: **Description of the change** -This is an automatic PR for synchronizing the changes performed externally at the [kubeapps development chart](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps) to the official Bitnami chart. +This is an automatic PR for synchronizing the changes performed externally at the [kubeapps development chart](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps) to the official Bitnami chart. **Benefits** diff --git a/script/tpl/PR_internal_chart_template.md b/script/tpl/PR_internal_chart_template.md index 76635029d1f..6fcd17a59e4 100644 --- a/script/tpl/PR_internal_chart_template.md +++ b/script/tpl/PR_internal_chart_template.md @@ -4,7 +4,7 @@ This is an automatic PR for synchronizing the changes performed externally at th ### Benefits -The Kubeapps [development chart](https://github.com/kubeapps/kubeapps/tree/main/chart/kubeapps) will get the newest changes, including image version updates and other updates. +The Kubeapps [development chart](https://github.com/vmware-tanzu/kubeapps/tree/main/chart/kubeapps) will get the newest changes, including image version updates and other updates. ### Possible drawbacks diff --git a/script/tpl/release_notes.md b/script/tpl/release_notes.md index f876bd66cb6..387b8417d83 100644 --- a/script/tpl/release_notes.md +++ b/script/tpl/release_notes.md @@ -16,6 +16,6 @@ kubectl create namespace kubeapps helm install kubeapps --namespace kubeapps bitnami/kubeapps ``` -To get started with Kubeapps, check out this [walkthrough](https://github.com/kubeapps/kubeapps/blob/main/docs/tutorials/getting-started.md). +To get started with Kubeapps, check out this [walkthrough](https://github.com/vmware-tanzu/kubeapps/blob/main/docs/tutorials/getting-started.md).