Skip to content

Commit

Permalink
Rename GitHub organization from bitnami-labs to bitnami (#191)
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
  • Loading branch information
carrodher authored Nov 6, 2023
1 parent 2ed56e0 commit 33fc84a
Show file tree
Hide file tree
Showing 54 changed files with 138 additions and 138 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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 ./...
Expand All @@ -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} ./
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion api/config.proto
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion api/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion charts-syncer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/sync.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions deployment/config/config.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions deployment/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

22 changes: 11 additions & 11 deletions docs/kubernetes-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,33 @@ 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

Edit [deployment/kustomization.yaml](/deployment/kustomization.yaml) and replace `images.NewTag` to point to the latest available release version. For example `v0.14.0`

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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
If you ran into any configuration issues just follow the steps 1 to 4 and rinse and repeat
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/bitnami-labs/charts-syncer
module github.com/bitnami/charts-syncer

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion internal/cache/cachedisk/cachedisk.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/chart/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/juju/errors"

"github.com/bitnami-labs/charts-syncer/api"
"github.com/bitnami/charts-syncer/api"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/chart/chart_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"
"testing"

"github.com/bitnami-labs/charts-syncer/api"
"github.com/bitnami/charts-syncer/api"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions internal/chart/dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/chart/dependency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/chart/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/indexer/api/index.proto
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/indexer/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/indexer/oci.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/indexer/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions internal/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion internal/utils/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"k8s.io/klog"

"github.com/bitnami-labs/charts-syncer/cmd"
"github.com/bitnami/charts-syncer/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/client.go
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/client/intermediate/intermediate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/intermediate/intermediate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
10 changes: 5 additions & 5 deletions pkg/client/repo/chartmuseum/chartmuseum.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading

0 comments on commit 33fc84a

Please sign in to comment.