diff --git a/.goreleaser.yml b/.goreleaser.yml index fef9741a..9db31ba4 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -9,7 +9,7 @@ builds: main: ./main.go binary: charts-syncer ldflags: - - -X github.com/bitnami-labs/charts-syncer/cmd.version={{.Version}} + - -X github.com/bitnami/charts-syncer/cmd.version={{.Version}} dockers: - ids: diff --git a/Makefile b/Makefile index f46f0635..f390f99f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ OUTPUT = ./dist/charts-syncer GO_SOURCES = $(shell find . -type f -name '*.go') VERSION := $(or $(VERSION), dev) -LDFLAGS="-X github.com/bitnami-labs/charts-syncer/cmd.version=$(VERSION)" +LDFLAGS="-X github.com/bitnami/charts-syncer/cmd.version=$(VERSION)" test: GO111MODULE=on go test ./... @@ -14,7 +14,7 @@ fullcover: GO111MODULE=on go tool cover -func=coverage.out gen: - go generate github.com/bitnami-labs/charts-syncer/... + go generate github.com/bitnami/charts-syncer/... build: $(GO_SOURCES) GO111MODULE=on CGO_ENABLED=0 go build -o $(OUTPUT) -ldflags ${LDFLAGS} ./ diff --git a/README.md b/README.md index 600a2fe9..0281eefd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![CircleCI](https://circleci.com/gh/bitnami-labs/charts-syncer.svg?style=svg&circle-token=91105ed254723ef1e3af739f6d31dc845136828c)](https://circleci.com/gh/bitnami-labs/charts-syncer/tree/master) +[![CircleCI](https://circleci.com/gh/bitnami/charts-syncer.svg?style=svg&circle-token=91105ed254723ef1e3af739f6d31dc845136828c)](https://circleci.com/gh/bitnami/charts-syncer/tree/master) # charts-syncer diff --git a/api/config.proto b/api/config.proto index 48844281..f714a822 100644 --- a/api/config.proto +++ b/api/config.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package api; -option go_package = "github.com/bitnami-labs/charts-syncer/api;api"; +option go_package = "github.com/bitnami/charts-syncer/api;api"; // Config file structure message Config { diff --git a/api/config_test.go b/api/config_test.go index 8727cb4a..f99fb11e 100644 --- a/api/config_test.go +++ b/api/config_test.go @@ -3,7 +3,7 @@ package api_test import ( "testing" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" ) func TestValidate(t *testing.T) { diff --git a/charts-syncer.yaml b/charts-syncer.yaml index 99ad2b20..2cf99dd6 100644 --- a/charts-syncer.yaml +++ b/charts-syncer.yaml @@ -45,7 +45,7 @@ target: password: "PASSWORD" # charts is an OPTIONAL list to specify a subset of charts to be synchronized # It is mandatory if the source repo is OCI and not autodiscovery is supported in that repository -# More info here https://github.com/bitnami-labs/charts-syncer#charts-index-for-oci-based-repositories +# More info here https://github.com/bitnami/charts-syncer#charts-index-for-oci-based-repositories charts: - redis - etcd diff --git a/cmd/root.go b/cmd/root.go index 41dbfa2e..eb8dfd12 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -13,7 +13,7 @@ const ( var ( rootUsage = `charts-syncer is a tool to synchronize chart repositories from a source repository to a target repository -Find more information at: https://github.com/bitnami-labs/charts-syncer` +Find more information at: https://github.com/bitnami/charts-syncer` rootConfig string rootDryRun bool diff --git a/cmd/sync.go b/cmd/sync.go index 6b53a112..413f5e88 100644 --- a/cmd/sync.go +++ b/cmd/sync.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/config" - "github.com/bitnami-labs/charts-syncer/pkg/syncer" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/config" + "github.com/bitnami/charts-syncer/pkg/syncer" "github.com/juju/errors" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" diff --git a/deployment/config/config.yaml b/deployment/config/config.yaml index b1493994..76523e9e 100644 --- a/deployment/config/config.yaml +++ b/deployment/config/config.yaml @@ -1,6 +1,6 @@ -# Charts syncer config file https://github.com/bitnami-labs/charts-syncer/blob/master/charts-syncer.yaml +# Charts syncer config file https://github.com/bitnami/charts-syncer/blob/master/charts-syncer.yaml -# Relocate also container images https://github.com/bitnami-labs/charts-syncer#sync-helm-charts-and-container-images +# Relocate also container images https://github.com/bitnami/charts-syncer#sync-helm-charts-and-container-images # relocateContainerImages: true source: repo: diff --git a/deployment/kustomization.yaml b/deployment/kustomization.yaml index bb58253b..f1760049 100644 --- a/deployment/kustomization.yaml +++ b/deployment/kustomization.yaml @@ -7,7 +7,7 @@ commonLabels: images: - name: gcr.io/bitnami-labs/charts-syncer # Set this value to the latest release - # https://github.com/bitnami-labs/charts-syncer/releases + # https://github.com/bitnami/charts-syncer/releases newTag: v0.20.1 resources: @@ -30,4 +30,4 @@ secretGenerator: # useful if you are loading creds from a GCR/ACR service account p12/json file # files: # - target-password=config/my_gcr_creds.json - + diff --git a/docs/kubernetes-deployment.md b/docs/kubernetes-deployment.md index 75b4c992..9f85aaa2 100644 --- a/docs/kubernetes-deployment.md +++ b/docs/kubernetes-deployment.md @@ -7,14 +7,14 @@ A native way of having two Helm Chart repositories synced is to run charts-synce The [deployment/](/deployment) directory in this repository contains a set of Kubernetes templates that must be used to complete this guide. ```bash -$ git clone https://github.com/bitnami-labs/charts-syncer.git -$ cd charts-syncer +git clone https://github.com/bitnami/charts-syncer.git +cd charts-syncer ``` ### Step 1 - Configure charts-syncer -Edit the configuration file from [deployment/config/config.yaml](/deployment/config/config.yaml) and specify your source and target chart repositories. -You can find a reference example [here](https://github.com/bitnami-labs/charts-syncer/blob/master/charts-syncer.yaml). +Edit the configuration file from [deployment/config/config.yaml](/deployment/config/config.yaml) and specify your source and target chart repositories. +You can find a reference example [here](https://github.com/bitnami/charts-syncer/blob/master/charts-syncer.yaml). ### Step 2 (optional) - Update deployment options @@ -22,19 +22,18 @@ Edit [deployment/kustomization.yaml](/deployment/kustomization.yaml) and replace You can also change the frequency of execution of the cron job by editing the schedule property in [deployment/cronjob.yaml](/deployment/cronjob.yaml). By default, it will be run each 30 minutes. - ### Step 3 - Deploy the manifests to your Kubernetes cluster Charts-syncer will be deployed by default to the `charts-syncer` namespace, so the first step is to create it ```bash -$ kubectl create namespace charts-syncer +kubectl create namespace charts-syncer ``` If none of your Helm Chart or Container repositories require authentication, deploying charts syncer is as simple as executing ```bash -$ kubectl apply -k ./deployment +kubectl apply -k ./deployment ``` If AuthN is required, a set of credentials need to be provided via one of the following two methods @@ -55,11 +54,12 @@ TARGET_CONTAINERS_AUTH_USERNAME='my_target_container_registry_username' \ TARGET_CONTAINERS_AUTH_PASSWORD='my_target_container_registry_password' \ kubectl apply -k ./deployment ``` -The full list of credentials and env variables can be found [here](https://github.com/bitnami-labs/charts-syncer#configuration) + +The full list of credentials and env variables can be found [here](https://github.com/bitnami/charts-syncer#configuration) #### b - Updating secrets template -Alternatively, you can modify [deployment/config/secrets.env](/deployment/config/secrets.env) +Alternatively, you can modify [deployment/config/secrets.env](/deployment/config/secrets.env) ```diff # Source repositories credentials @@ -80,7 +80,7 @@ Alternatively, you can modify [deployment/config/secrets.env](/deployment/config once the file has been changed just execute ```bash -$ kubectl apply -k ./deployment +kubectl apply -k ./deployment ``` ### Step 4 - Try and debug an initial sync @@ -117,4 +117,4 @@ test-initial-sync 1/1 105s 2m45s $ kubectl logs -l app=charts-syncer -f ``` -If you ran into any configuration issues just follow the steps 1 to 4 and rinse and repeat \ No newline at end of file +If you ran into any configuration issues just follow the steps 1 to 4 and rinse and repeat diff --git a/go.mod b/go.mod index 3e015dfa..dbcced8c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/bitnami-labs/charts-syncer +module github.com/bitnami/charts-syncer go 1.19 diff --git a/internal/cache/cachedisk/cachedisk.go b/internal/cache/cachedisk/cachedisk.go index 1f828a2f..bfc0101c 100644 --- a/internal/cache/cachedisk/cachedisk.go +++ b/internal/cache/cachedisk/cachedisk.go @@ -9,7 +9,7 @@ import ( "github.com/juju/errors" "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/internal/utils" ) // Cache implements a Cacher using the local filesystem. diff --git a/internal/chart/chart.go b/internal/chart/chart.go index be3aaba5..d6afd87f 100644 --- a/internal/chart/chart.go +++ b/internal/chart/chart.go @@ -8,7 +8,7 @@ import ( "github.com/juju/errors" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" ) var ( diff --git a/internal/chart/chart_test.go b/internal/chart/chart_test.go index 8028db30..c4503bed 100644 --- a/internal/chart/chart_test.go +++ b/internal/chart/chart_test.go @@ -6,7 +6,7 @@ import ( "path" "testing" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" ) var ( diff --git a/internal/chart/dependency.go b/internal/chart/dependency.go index 07e4fe86..b7a1e389 100644 --- a/internal/chart/dependency.go +++ b/internal/chart/dependency.go @@ -16,9 +16,9 @@ import ( "k8s.io/klog" "sigs.k8s.io/yaml" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client" ) // dependencies is the list of dependencies of a chart diff --git a/internal/chart/dependency_test.go b/internal/chart/dependency_test.go index f538313a..2f9085e7 100644 --- a/internal/chart/dependency_test.go +++ b/internal/chart/dependency_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/utils" "helm.sh/helm/v3/pkg/chart" "sigs.k8s.io/yaml" ) diff --git a/internal/chart/sync.go b/internal/chart/sync.go index b245312e..f166a05c 100644 --- a/internal/chart/sync.go +++ b/internal/chart/sync.go @@ -6,8 +6,8 @@ import ( "github.com/juju/errors" "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/utils" ) // ChangeReferences changes the references of a chart tgz file from the source diff --git a/internal/config/config.go b/internal/config/config.go index 0b8f3d12..ba601a16 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" "github.com/bitnami-labs/pbjson" "github.com/golang/protobuf/proto" "github.com/juju/errors" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 46dca6d3..500d6916 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" "github.com/spf13/viper" "google.golang.org/protobuf/proto" ) diff --git a/internal/indexer/api/index.proto b/internal/indexer/api/index.proto index 8f9d9381..9a36339b 100644 --- a/internal/indexer/api/index.proto +++ b/internal/indexer/api/index.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package api; -option go_package = "github.com/bitnami-labs/charts-syncer/internal/indexer/api;api"; +option go_package = "github.com/bitnami/charts-syncer/internal/indexer/api;api"; // ChartMetadata contains relevant information about the released chart message ChartMetadata { diff --git a/internal/indexer/indexer.go b/internal/indexer/indexer.go index 04831f7a..498b4a29 100644 --- a/internal/indexer/indexer.go +++ b/internal/indexer/indexer.go @@ -2,7 +2,7 @@ package indexer import ( "context" - "github.com/bitnami-labs/charts-syncer/internal/indexer/api" + "github.com/bitnami/charts-syncer/internal/indexer/api" ) // Indexer is the interface that an indexer should implement diff --git a/internal/indexer/oci.go b/internal/indexer/oci.go index 040ddb7a..88c44dc0 100644 --- a/internal/indexer/oci.go +++ b/internal/indexer/oci.go @@ -7,7 +7,7 @@ import ( "net/url" "os" - "github.com/bitnami-labs/charts-syncer/internal/indexer/api" + "github.com/bitnami/charts-syncer/internal/indexer/api" "github.com/bitnami-labs/pbjson" containerderrs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/remotes" diff --git a/internal/indexer/resolver.go b/internal/indexer/resolver.go index e8d1b258..0d69d6f1 100644 --- a/internal/indexer/resolver.go +++ b/internal/indexer/resolver.go @@ -6,7 +6,7 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" - "github.com/bitnami-labs/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/internal/utils" ) func newDockerResolver(u *url.URL, username, password string, insecure bool) remotes.Resolver { diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 98f8abff..f1dda7f2 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -21,8 +21,8 @@ import ( helmRepo "helm.sh/helm/v3/pkg/repo" "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache" ) const ( diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go index 48df7792..4cf38cd4 100644 --- a/internal/utils/utils_test.go +++ b/internal/utils/utils_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" "helm.sh/helm/v3/pkg/chart" helmRepo "helm.sh/helm/v3/pkg/repo" ) diff --git a/main.go b/main.go index 4aaf7779..e7774964 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/cmd" + "github.com/bitnami/charts-syncer/cmd" ) func main() { diff --git a/pkg/client/client.go b/pkg/client/client.go index 221f2fe3..c5228b90 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -1,7 +1,7 @@ package client import ( - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/pkg/client/types" "helm.sh/helm/v3/pkg/chart" ) diff --git a/pkg/client/intermediate/intermediate.go b/pkg/client/intermediate/intermediate.go index db15abc4..70a67204 100644 --- a/pkg/client/intermediate/intermediate.go +++ b/pkg/client/intermediate/intermediate.go @@ -9,9 +9,9 @@ import ( "regexp" "sort" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client" + "github.com/bitnami/charts-syncer/pkg/client/types" "github.com/juju/errors" "helm.sh/helm/v3/pkg/chart" ) diff --git a/pkg/client/intermediate/intermediate_test.go b/pkg/client/intermediate/intermediate_test.go index 4886436c..7ddf2d85 100644 --- a/pkg/client/intermediate/intermediate_test.go +++ b/pkg/client/intermediate/intermediate_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - intermediate "github.com/bitnami-labs/charts-syncer/pkg/client/intermediate" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + intermediate "github.com/bitnami/charts-syncer/pkg/client/intermediate" + "github.com/bitnami/charts-syncer/pkg/client/types" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/time" ) diff --git a/pkg/client/repo/chartmuseum/chartmuseum.go b/pkg/client/repo/chartmuseum/chartmuseum.go index d04d5700..946270c1 100644 --- a/pkg/client/repo/chartmuseum/chartmuseum.go +++ b/pkg/client/repo/chartmuseum/chartmuseum.go @@ -9,15 +9,15 @@ import ( "os" "path/filepath" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" "github.com/juju/errors" "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/types" "helm.sh/helm/v3/pkg/chart" ) diff --git a/pkg/client/repo/chartmuseum/chartmuseum_test.go b/pkg/client/repo/chartmuseum/chartmuseum_test.go index f0e807cb..21cf1822 100644 --- a/pkg/client/repo/chartmuseum/chartmuseum_test.go +++ b/pkg/client/repo/chartmuseum/chartmuseum_test.go @@ -14,12 +14,12 @@ import ( "helm.sh/helm/v3/pkg/time" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache/cachedisk" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/chartmuseum" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache/cachedisk" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo/chartmuseum" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/types" ) var ( diff --git a/pkg/client/repo/chartmuseum/chartmuseumtester.go b/pkg/client/repo/chartmuseum/chartmuseumtester.go index 32259fe6..23125859 100644 --- a/pkg/client/repo/chartmuseum/chartmuseumtester.go +++ b/pkg/client/repo/chartmuseum/chartmuseumtester.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" ) var ( diff --git a/pkg/client/repo/clienttester.go b/pkg/client/repo/clienttester.go index 7a7a1a19..33cc3d36 100644 --- a/pkg/client/repo/clienttester.go +++ b/pkg/client/repo/clienttester.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/chartmuseum" + "github.com/bitnami/charts-syncer/pkg/client/repo/chartmuseum" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" ) // ClientTester defines the methods that a fake tester should implement diff --git a/pkg/client/repo/core.go b/pkg/client/repo/core.go index 7bc35338..7456751d 100644 --- a/pkg/client/repo/core.go +++ b/pkg/client/repo/core.go @@ -5,15 +5,15 @@ import ( "github.com/juju/errors" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache/cachedisk" - "github.com/bitnami-labs/charts-syncer/pkg/client" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/chartmuseum" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/harbor" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/local" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/oci" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache/cachedisk" + "github.com/bitnami/charts-syncer/pkg/client" + "github.com/bitnami/charts-syncer/pkg/client/repo/chartmuseum" + "github.com/bitnami/charts-syncer/pkg/client/repo/harbor" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/repo/local" + "github.com/bitnami/charts-syncer/pkg/client/repo/oci" + "github.com/bitnami/charts-syncer/pkg/client/types" ) // NewClient returns a Client object diff --git a/pkg/client/repo/core_test.go b/pkg/client/repo/core_test.go index 6a52c06e..a4ddb768 100644 --- a/pkg/client/repo/core_test.go +++ b/pkg/client/repo/core_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/oci" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/pkg/client/repo/oci" ) // Creates an HTTP server that knows how to reply to all OCI related requests diff --git a/pkg/client/repo/harbor/harbor.go b/pkg/client/repo/harbor/harbor.go index a27b09f7..aeb8f637 100644 --- a/pkg/client/repo/harbor/harbor.go +++ b/pkg/client/repo/harbor/harbor.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/types" "github.com/juju/errors" "helm.sh/helm/v3/pkg/chart" "k8s.io/klog" diff --git a/pkg/client/repo/harbor/harbor_test.go b/pkg/client/repo/harbor/harbor_test.go index 054cef39..85b81580 100644 --- a/pkg/client/repo/harbor/harbor_test.go +++ b/pkg/client/repo/harbor/harbor_test.go @@ -15,12 +15,12 @@ import ( "helm.sh/helm/v3/pkg/time" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache/cachedisk" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/harbor" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache/cachedisk" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo/harbor" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/types" ) var ( diff --git a/pkg/client/repo/harbor/harbortester.go b/pkg/client/repo/harbor/harbortester.go index 14b26703..b8803bcf 100644 --- a/pkg/client/repo/harbor/harbortester.go +++ b/pkg/client/repo/harbor/harbortester.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" ) var ( diff --git a/pkg/client/repo/helmclassic/helmclassic.go b/pkg/client/repo/helmclassic/helmclassic.go index 8209dbc7..fae9ef70 100644 --- a/pkg/client/repo/helmclassic/helmclassic.go +++ b/pkg/client/repo/helmclassic/helmclassic.go @@ -12,10 +12,10 @@ import ( "helm.sh/helm/v3/pkg/repo" "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/types" ) // Repo allows to operate a chart repository. diff --git a/pkg/client/repo/helmclassic/helmclassic_test.go b/pkg/client/repo/helmclassic/helmclassic_test.go index 0aaf7369..5240c5d5 100644 --- a/pkg/client/repo/helmclassic/helmclassic_test.go +++ b/pkg/client/repo/helmclassic/helmclassic_test.go @@ -12,11 +12,11 @@ import ( "helm.sh/helm/v3/pkg/time" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache/cachedisk" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache/cachedisk" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/client/types" ) var ( diff --git a/pkg/client/repo/helmclassic/helmclassictester.go b/pkg/client/repo/helmclassic/helmclassictester.go index 2754ea55..d4162d82 100644 --- a/pkg/client/repo/helmclassic/helmclassictester.go +++ b/pkg/client/repo/helmclassic/helmclassictester.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" "gopkg.in/yaml.v2" ) diff --git a/pkg/client/repo/local/local.go b/pkg/client/repo/local/local.go index bf688a11..137c4204 100644 --- a/pkg/client/repo/local/local.go +++ b/pkg/client/repo/local/local.go @@ -11,8 +11,8 @@ import ( "github.com/juju/errors" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/types" "helm.sh/helm/v3/pkg/chart" ) diff --git a/pkg/client/repo/local/local_test.go b/pkg/client/repo/local/local_test.go index 6918ddc2..8e7f4fe0 100644 --- a/pkg/client/repo/local/local_test.go +++ b/pkg/client/repo/local/local_test.go @@ -6,8 +6,8 @@ import ( "sort" "testing" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/local" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/pkg/client/repo/local" + "github.com/bitnami/charts-syncer/pkg/client/types" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/time" ) diff --git a/pkg/client/repo/oci/oci.go b/pkg/client/repo/oci/oci.go index 0d87701b..1f09cca7 100644 --- a/pkg/client/repo/oci/oci.go +++ b/pkg/client/repo/oci/oci.go @@ -27,11 +27,11 @@ import ( orascontext "oras.land/oras-go/pkg/context" "oras.land/oras-go/pkg/oras" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache" - "github.com/bitnami-labs/charts-syncer/internal/indexer" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache" + "github.com/bitnami/charts-syncer/internal/indexer" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/types" ) const ( diff --git a/pkg/client/repo/oci/oci_internal_test.go b/pkg/client/repo/oci/oci_internal_test.go index b830b980..ce3f9035 100644 --- a/pkg/client/repo/oci/oci_internal_test.go +++ b/pkg/client/repo/oci/oci_internal_test.go @@ -7,7 +7,7 @@ import ( "sort" "testing" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" ) diff --git a/pkg/client/repo/oci/oci_test.go b/pkg/client/repo/oci/oci_test.go index 2bc30cc8..5cb12f46 100644 --- a/pkg/client/repo/oci/oci_test.go +++ b/pkg/client/repo/oci/oci_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/oci" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo/oci" + "github.com/bitnami/charts-syncer/pkg/client/types" _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" "helm.sh/helm/v3/pkg/chart" ) diff --git a/pkg/client/repo/oci/ocitester.go b/pkg/client/repo/oci/ocitester.go index 75a27cbe..d4ed991e 100644 --- a/pkg/client/repo/oci/ocitester.go +++ b/pkg/client/repo/oci/ocitester.go @@ -22,10 +22,10 @@ import ( "oras.land/oras-go/pkg/content" "oras.land/oras-go/pkg/oras" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/cache/cachedisk" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/cache/cachedisk" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" ) var ( diff --git a/pkg/syncer/fakesyncer.go b/pkg/syncer/fakesyncer.go index 8e42c68c..2fe843d1 100644 --- a/pkg/syncer/fakesyncer.go +++ b/pkg/syncer/fakesyncer.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/local" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/pkg/client/repo/local" ) // FakeSyncerOpts allows to configure a Fake syncer. diff --git a/pkg/syncer/index.go b/pkg/syncer/index.go index 7fde27d8..22d4d7c8 100644 --- a/pkg/syncer/index.go +++ b/pkg/syncer/index.go @@ -11,8 +11,8 @@ import ( "github.com/philopon/go-toposort" "k8s.io/klog" - "github.com/bitnami-labs/charts-syncer/internal/chart" - "github.com/bitnami-labs/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/internal/chart" + "github.com/bitnami/charts-syncer/internal/utils" ) // Chart describes a chart, including dependencies diff --git a/pkg/syncer/sync.go b/pkg/syncer/sync.go index a4bfef0b..ffc3a169 100644 --- a/pkg/syncer/sync.go +++ b/pkg/syncer/sync.go @@ -7,10 +7,10 @@ import ( "path" "path/filepath" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/chart" - "github.com/bitnami-labs/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/internal/chart" + "github.com/bitnami/charts-syncer/internal/utils" "github.com/juju/errors" "github.com/mkmik/multierror" "github.com/vmware-tanzu/asset-relocation-tool-for-kubernetes/pkg/mover" diff --git a/pkg/syncer/sync_internal_test.go b/pkg/syncer/sync_internal_test.go index 8fe9284d..67b32994 100644 --- a/pkg/syncer/sync_internal_test.go +++ b/pkg/syncer/sync_internal_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/bitnami-labs/charts-syncer/api" + "github.com/bitnami/charts-syncer/api" "github.com/vmware-tanzu/asset-relocation-tool-for-kubernetes/pkg/mover" ) diff --git a/pkg/syncer/sync_test.go b/pkg/syncer/sync_test.go index af1a5233..326b2aa2 100644 --- a/pkg/syncer/sync_test.go +++ b/pkg/syncer/sync_test.go @@ -12,11 +12,11 @@ import ( "strings" "testing" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/internal/utils" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo/helmclassic" - "github.com/bitnami-labs/charts-syncer/pkg/syncer" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/internal/utils" + "github.com/bitnami/charts-syncer/pkg/client/repo" + "github.com/bitnami/charts-syncer/pkg/client/repo/helmclassic" + "github.com/bitnami/charts-syncer/pkg/syncer" ) func getChartIndex(t *testing.T, name string, targetRepo *api.Target, tester repo.ClientTester) []*helmclassic.ChartVersion { diff --git a/pkg/syncer/syncer.go b/pkg/syncer/syncer.go index c793beb5..30470077 100644 --- a/pkg/syncer/syncer.go +++ b/pkg/syncer/syncer.go @@ -3,11 +3,11 @@ package syncer import ( "os" - "github.com/bitnami-labs/charts-syncer/api" - "github.com/bitnami-labs/charts-syncer/pkg/client" - "github.com/bitnami-labs/charts-syncer/pkg/client/intermediate" - "github.com/bitnami-labs/charts-syncer/pkg/client/repo" - "github.com/bitnami-labs/charts-syncer/pkg/client/types" + "github.com/bitnami/charts-syncer/api" + "github.com/bitnami/charts-syncer/pkg/client" + "github.com/bitnami/charts-syncer/pkg/client/intermediate" + "github.com/bitnami/charts-syncer/pkg/client/repo" + "github.com/bitnami/charts-syncer/pkg/client/types" "github.com/juju/errors" "k8s.io/klog" )