Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

update org from tricksterproxy to trickstercache #575

Merged
merged 1 commit into from
May 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .spelling
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ builtin
SetExtent
datapoints
datapoint
tricksterproxy
trickstercache
opentelemetry
todo
jaeger
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Should you wish to work on an issue, please claim it first by commenting on the

If you have questions about one of the issues, please comment on them and one of the maintainers will clarify it. For a quicker response, contact us on the #trickster slack channel.

For complete instructions on how to compile see: [Building From Source](https://github.com/tricksterproxy/trickster#building-from-source)
For complete instructions on how to compile see: [Building From Source](https://github.com/trickstercache/trickster#building-from-source)

For quickly compiling and testing your changes do:

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# This docker file is for local dev, the official Dockerfile is at
# https://github.com/tricksterproxy/trickster-docker-images/
# https://github.com/trickstercache/trickster-docker-images/

FROM golang:1.16 as builder
COPY . /go/src/github.com/tricksterproxy/trickster
WORKDIR /go/src/github.com/tricksterproxy/trickster
COPY . /go/src/github.com/trickstercache/trickster
WORKDIR /go/src/github.com/trickstercache/trickster

RUN GOOS=linux CGO_ENABLED=0 make build

FROM alpine:3
LABEL maintainer "The Trickster Authors <[email protected]>"

COPY --from=builder /go/src/github.com/tricksterproxy/trickster/OPATH/trickster /usr/local/bin/trickster
COPY --from=builder /go/src/github.com/trickstercache/trickster/OPATH/trickster /usr/local/bin/trickster
COPY examples/conf/example.full.yaml /etc/trickster/trickster.yaml
RUN chown nobody /usr/local/bin/trickster
RUN chmod +x /usr/local/bin/trickster
Expand Down
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ should either be part of a GitHub issue or PR, or be sent to `cncf-trickster-mai

## GitHub Project Administration

The [@tricksterproxy/maintainers](https://github.com/orgs/tricksterproxy/teams/maintainers) team reflects the list of Maintainers.
The [@trickstercache/maintainers](https://github.com/orgs/trickstercache/teams/maintainers) team reflects the list of Maintainers.

## Other Projects

Expand Down
6 changes: 3 additions & 3 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
|Chris Randles ([@crandles](https://github.com/crandles)) | <[email protected]> | Comcast | Core Functionality |
|Adam Ross ([@LimitlessEarth](https://github.com/LimitlessEarth)) | <[email protected]> | Comcast | Deployment & Artifacts (Makefile, Dockerfile, Helm Charts, etc) |

You can contact the maintainers using the `@tricksterproxy/maintainers` handle in an Issue or PR, or via email at <[email protected]>.
You can contact the maintainers using the `@trickstercache/maintainers` handle in an Issue or PR, or via email at <[email protected]>.

## Reviewers

Additional community members comprise our Reviewers team, who may review and approve PRs, but otherwise do not maintain the project. Reviewers are generally engaged in a PR by a Maintainer seeking input or binding approval from someone with additional expertise in the PR's technical domain. Refer to the [@tricksterproxy/reviewers](https://github.com/orgs/tricksterproxy/teams/reviewers/members) team for a list of our Reviewers.
Additional community members comprise our Reviewers team, who may review and approve PRs, but otherwise do not maintain the project. Reviewers are generally engaged in a PR by a Maintainer seeking input or binding approval from someone with additional expertise in the PR's technical domain. Refer to the [@trickstercache/reviewers](https://github.com/orgs/trickstercache/teams/reviewers/members) team for a list of our Reviewers.

You can tag all reviewers in issues/commits/PR's using the `@tricksterproxy/reviewers` handle.
You can tag all reviewers in issues/commits/PR's using the `@trickstercache/reviewers` handle.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ docker:
.PHONY: docker-release
docker-release:
# linux x86 image
docker build --build-arg IMAGE_ARCH=amd64 --build-arg GOARCH=amd64 -f ./deploy/Dockerfile -t tricksterproxy/trickster:$(IMAGE_TAG) .
docker build --build-arg IMAGE_ARCH=amd64 --build-arg GOARCH=amd64 -f ./deploy/Dockerfile -t trickstercache/trickster:$(IMAGE_TAG) .
# linux arm image
docker build --build-arg IMAGE_ARCH=arm64v8 --build-arg GOARCH=arm64 -f ./deploy/Dockerfile -t tricksterproxy/trickster:arm64v8-$(IMAGE_TAG) .
docker build --build-arg IMAGE_ARCH=arm64v8 --build-arg GOARCH=arm64 -f ./deploy/Dockerfile -t trickstercache/trickster:arm64v8-$(IMAGE_TAG) .

.PHONY: style
style:
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# <img src="./docs/images/logos/trickster-logo.svg" width=90 />&nbsp;&nbsp;&nbsp;&nbsp;<img src="./docs/images/logos/trickster-text.svg" width=420 /> [![Follow on Twitter](https://img.shields.io/twitter/follow/trickstercache.svg?style=social&logo=twitter)](https://twitter.com/trickstercache)

[![License](https://img.shields.io/github/license/tricksterproxy/trickster)](/LICENSE)
[![Coverage Status](https://coveralls.io/repos/github/tricksterproxy/trickster/badge.svg)](https://coveralls.io/github/tricksterproxy/trickster)
[![build Status](https://github.com/tricksterproxy/trickster/workflows/build/badge.svg)](https://github.com/tricksterproxy/trickster/actions)
[![Go Report Card](https://goreportcard.com/badge/github.com/tricksterproxy/trickster)](https://goreportcard.com/report/github.com/tricksterproxy/trickster)
[![License](https://img.shields.io/github/license/trickstercache/trickster)](/LICENSE)
[![Coverage Status](https://coveralls.io/repos/github/trickstercache/trickster/badge.svg)](https://coveralls.io/github/trickstercache/trickster)
[![build Status](https://github.com/trickstercache/trickster/workflows/build/badge.svg)](https://github.com/trickstercache/trickster/actions)
[![Go Report Card](https://goreportcard.com/badge/github.com/trickstercache/trickster)](https://goreportcard.com/report/github.com/trickstercache/trickster)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2518/badge)](https://bestpractices.coreinfrastructure.org/en/projects/2518)
[![GoDoc](https://godoc.org/github.com/tricksterproxy/trickster?status.svg)](https://godoc.org/github.com/tricksterproxy/trickster)
[![GoDoc](https://godoc.org/github.com/trickstercache/trickster?status.svg)](https://godoc.org/github.com/trickstercache/trickster)
[![Docker Pulls](https://img.shields.io/docker/pulls/tricksterio/trickster.svg?maxAge=86400)](https://hub.docker.com/r/tricksterio/trickster)

Trickster is an HTTP reverse proxy/cache for http applications and a dashboard query accelerator for time series databases.
Expand All @@ -16,7 +16,7 @@ Learn more below, and check out our [roadmap](./docs/roadmap.md) to find out wha

Trickster is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CNCF) as a sandbox level project. If you are a company that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF.

Note: Trickster v1.1 is the production release, sourced from the [v1.1.x](https://github.com/tricksterproxy/trickster/tree/v1.1.x) branch. The `main` branch sources Trickster 2.0, which is currently in beta.
Note: Trickster v1.1 is the production release, sourced from the [v1.1.x](https://github.com/trickstercache/trickster/tree/v1.1.x) branch. The `main` branch sources Trickster 2.0, which is currently in beta.

## HTTP Reverse Proxy Cache

Expand Down Expand Up @@ -83,7 +83,7 @@ Check out our end-to-end [Docker Compose demo composition](./examples/docker-com

Docker images are available on Docker Hub:

$ docker run --name trickster -d -v /path/to/trickster.yaml:/etc/trickster/trickster.yaml -p 0.0.0.0:8480:8480 tricksterproxy/trickster
$ docker run --name trickster -d -v /path/to/trickster.yaml:/etc/trickster/trickster.yaml -p 0.0.0.0:8480:8480 trickstercache/trickster

See the 'deploy' Directory for more information about using or creating Trickster docker images.

Expand All @@ -93,7 +93,7 @@ See the 'deploy' Directory for Kube and deployment files and examples.

### Helm

Trickster Helm Charts are located at <https://helm.tricksterproxy.io> for installation, and maintained at <https://github.com/tricksterproxy/helm-charts>. We welcome chart contributions.
Trickster Helm Charts are located at <https://helm.tricksterproxy.io> for installation, and maintained at <https://github.com/trickstercache/helm-charts>. We welcome chart contributions.

### Building from source

Expand All @@ -104,17 +104,17 @@ You can directly use the `go` tool to download and install the `trickster`
binary into your `GOPATH`:

```bash
$ go get github.com/tricksterproxy/trickster/cmd/trickster
$ go get github.com/trickstercache/trickster/cmd/trickster
# this starts a prometheus accelerator proxy for the provided endpoint
$ trickster -origin-url http://prometheus.example.com:9090 -provider prometheus
```

You can also clone the repository yourself and build using `make`:

```bash
$ mkdir -p $GOPATH/src/github.com/tricksterproxy
$ cd $GOPATH/src/github.com/tricksterproxy
$ git clone https://github.com/tricksterproxy/trickster.git
$ mkdir -p $GOPATH/src/github.com/trickstercache
$ cd $GOPATH/src/github.com/trickstercache
$ git clone https://github.com/trickstercache/trickster.git
$ cd trickster
$ make build
$ ./OPATH/trickster -origin-url http://prometheus.example.com:9090 -provider prometheus
Expand Down
30 changes: 15 additions & 15 deletions cmd/trickster/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ import (
"sync"
"time"

"github.com/tricksterproxy/trickster/cmd/trickster/config"
ro "github.com/tricksterproxy/trickster/cmd/trickster/config/reload/options"
"github.com/tricksterproxy/trickster/pkg/backends/alb"
"github.com/tricksterproxy/trickster/pkg/backends/healthcheck"
"github.com/tricksterproxy/trickster/pkg/cache"
"github.com/tricksterproxy/trickster/pkg/cache/memory"
"github.com/tricksterproxy/trickster/pkg/cache/providers"
"github.com/tricksterproxy/trickster/pkg/cache/registration"
tl "github.com/tricksterproxy/trickster/pkg/observability/logging"
"github.com/tricksterproxy/trickster/pkg/observability/metrics"
tr "github.com/tricksterproxy/trickster/pkg/observability/tracing/registration"
"github.com/tricksterproxy/trickster/pkg/proxy/handlers"
th "github.com/tricksterproxy/trickster/pkg/proxy/handlers"
"github.com/tricksterproxy/trickster/pkg/routing"
"github.com/tricksterproxy/trickster/pkg/runtime"
"github.com/trickstercache/trickster/cmd/trickster/config"
ro "github.com/trickstercache/trickster/cmd/trickster/config/reload/options"
"github.com/trickstercache/trickster/pkg/backends/alb"
"github.com/trickstercache/trickster/pkg/backends/healthcheck"
"github.com/trickstercache/trickster/pkg/cache"
"github.com/trickstercache/trickster/pkg/cache/memory"
"github.com/trickstercache/trickster/pkg/cache/providers"
"github.com/trickstercache/trickster/pkg/cache/registration"
tl "github.com/trickstercache/trickster/pkg/observability/logging"
"github.com/trickstercache/trickster/pkg/observability/metrics"
tr "github.com/trickstercache/trickster/pkg/observability/tracing/registration"
"github.com/trickstercache/trickster/pkg/proxy/handlers"
th "github.com/trickstercache/trickster/pkg/proxy/handlers"
"github.com/trickstercache/trickster/pkg/routing"
"github.com/trickstercache/trickster/pkg/runtime"

"github.com/gorilla/mux"
)
Expand Down
24 changes: 12 additions & 12 deletions cmd/trickster/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ import (
"sync"
"time"

reload "github.com/tricksterproxy/trickster/cmd/trickster/config/reload/options"
bo "github.com/tricksterproxy/trickster/pkg/backends/options"
rule "github.com/tricksterproxy/trickster/pkg/backends/rule/options"
"github.com/tricksterproxy/trickster/pkg/cache/negative"
cache "github.com/tricksterproxy/trickster/pkg/cache/options"
fropt "github.com/tricksterproxy/trickster/pkg/frontend/options"
lo "github.com/tricksterproxy/trickster/pkg/observability/logging/options"
mo "github.com/tricksterproxy/trickster/pkg/observability/metrics/options"
tracing "github.com/tricksterproxy/trickster/pkg/observability/tracing/options"
rewriter "github.com/tricksterproxy/trickster/pkg/proxy/request/rewriter"
rwopts "github.com/tricksterproxy/trickster/pkg/proxy/request/rewriter/options"
"github.com/tricksterproxy/trickster/pkg/util/yamlx"
reload "github.com/trickstercache/trickster/cmd/trickster/config/reload/options"
bo "github.com/trickstercache/trickster/pkg/backends/options"
rule "github.com/trickstercache/trickster/pkg/backends/rule/options"
"github.com/trickstercache/trickster/pkg/cache/negative"
cache "github.com/trickstercache/trickster/pkg/cache/options"
fropt "github.com/trickstercache/trickster/pkg/frontend/options"
lo "github.com/trickstercache/trickster/pkg/observability/logging/options"
mo "github.com/trickstercache/trickster/pkg/observability/metrics/options"
tracing "github.com/trickstercache/trickster/pkg/observability/tracing/options"
rewriter "github.com/trickstercache/trickster/pkg/proxy/request/rewriter"
rwopts "github.com/trickstercache/trickster/pkg/proxy/request/rewriter/options"
"github.com/trickstercache/trickster/pkg/util/yamlx"

"gopkg.in/yaml.v2"
)
Expand Down
12 changes: 6 additions & 6 deletions cmd/trickster/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"testing"
"time"

bo "github.com/tricksterproxy/trickster/pkg/backends/options"
rule "github.com/tricksterproxy/trickster/pkg/backends/rule/options"
"github.com/tricksterproxy/trickster/pkg/proxy/headers"
po "github.com/tricksterproxy/trickster/pkg/proxy/paths/options"
rwo "github.com/tricksterproxy/trickster/pkg/proxy/request/rewriter/options"
to "github.com/tricksterproxy/trickster/pkg/proxy/tls/options"
bo "github.com/trickstercache/trickster/pkg/backends/options"
rule "github.com/trickstercache/trickster/pkg/backends/rule/options"
"github.com/trickstercache/trickster/pkg/proxy/headers"
po "github.com/trickstercache/trickster/pkg/proxy/paths/options"
rwo "github.com/trickstercache/trickster/pkg/proxy/request/rewriter/options"
to "github.com/trickstercache/trickster/pkg/proxy/tls/options"
)

const emptyFilePath = "../../../testdata/test.empty.conf"
Expand Down
4 changes: 2 additions & 2 deletions cmd/trickster/config/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"net/url"
"time"

bo "github.com/tricksterproxy/trickster/pkg/backends/options"
"github.com/tricksterproxy/trickster/pkg/cache/negative"
bo "github.com/trickstercache/trickster/pkg/backends/options"
"github.com/trickstercache/trickster/pkg/cache/negative"
)

// Load returns the Application Configuration, starting with a default config,
Expand Down
4 changes: 2 additions & 2 deletions cmd/trickster/config/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"time"

"github.com/tricksterproxy/trickster/pkg/cache/evictionmethods"
tlstest "github.com/tricksterproxy/trickster/pkg/util/testing/tls"
"github.com/trickstercache/trickster/pkg/cache/evictionmethods"
tlstest "github.com/trickstercache/trickster/pkg/util/testing/tls"
)

func TestLoadConfiguration(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/trickster/config/reload/reload.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ package reload
import (
"sync"

"github.com/tricksterproxy/trickster/cmd/trickster/config"
"github.com/tricksterproxy/trickster/pkg/cache"
tl "github.com/tricksterproxy/trickster/pkg/observability/logging"
"github.com/trickstercache/trickster/cmd/trickster/config"
"github.com/trickstercache/trickster/pkg/cache"
tl "github.com/trickstercache/trickster/pkg/observability/logging"
)

// ReloaderFunc describes a function that loads and applies a Trickster config at startup,
Expand Down
2 changes: 1 addition & 1 deletion cmd/trickster/config/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package config
import (
"crypto/tls"

bo "github.com/tricksterproxy/trickster/pkg/backends/options"
bo "github.com/trickstercache/trickster/pkg/backends/options"
)

// TLSCertConfig returns the crypto/tls configuration object with a list of name-bound
Expand Down
4 changes: 2 additions & 2 deletions cmd/trickster/config/tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package config
import (
"testing"

"github.com/tricksterproxy/trickster/pkg/proxy/tls/options"
tlstest "github.com/tricksterproxy/trickster/pkg/util/testing/tls"
"github.com/trickstercache/trickster/pkg/proxy/tls/options"
tlstest "github.com/trickstercache/trickster/pkg/util/testing/tls"
)

func TestTLSCertConfig(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions cmd/trickster/listeners.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"net/http"
"time"

"github.com/tricksterproxy/trickster/cmd/trickster/config"
tl "github.com/tricksterproxy/trickster/pkg/observability/logging"
"github.com/tricksterproxy/trickster/pkg/observability/metrics"
"github.com/tricksterproxy/trickster/pkg/observability/tracing"
ph "github.com/tricksterproxy/trickster/pkg/proxy/handlers"
"github.com/tricksterproxy/trickster/pkg/proxy/listener"
ttls "github.com/tricksterproxy/trickster/pkg/proxy/tls"
"github.com/tricksterproxy/trickster/pkg/routing"
"github.com/trickstercache/trickster/cmd/trickster/config"
tl "github.com/trickstercache/trickster/pkg/observability/logging"
"github.com/trickstercache/trickster/pkg/observability/metrics"
"github.com/trickstercache/trickster/pkg/observability/tracing"
ph "github.com/trickstercache/trickster/pkg/proxy/handlers"
"github.com/trickstercache/trickster/pkg/proxy/listener"
ttls "github.com/trickstercache/trickster/pkg/proxy/tls"
"github.com/trickstercache/trickster/pkg/routing"
)

var lg = listener.NewListenerGroup()
Expand Down
2 changes: 1 addition & 1 deletion cmd/trickster/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"sync"

"github.com/tricksterproxy/trickster/pkg/runtime"
"github.com/trickstercache/trickster/pkg/runtime"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/trickster/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ func TestRunConfig(t *testing.T) {

runConfig(nil, wg, nil, nil, []string{"-version"}, nil)

runConfig(nil, wg, nil, nil, []string{"-provider", "rpc", "-origin-url", "http://tricksterproxy.io"}, nil)
runConfig(nil, wg, nil, nil, []string{"-provider", "rpc", "-origin-url", "http://trickstercache.io"}, nil)

}
6 changes: 3 additions & 3 deletions cmd/trickster/signal.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"syscall"

"github.com/tricksterproxy/trickster/cmd/trickster/config"
"github.com/tricksterproxy/trickster/pkg/cache"
tl "github.com/tricksterproxy/trickster/pkg/observability/logging"
"github.com/trickstercache/trickster/cmd/trickster/config"
"github.com/trickstercache/trickster/pkg/cache"
tl "github.com/trickstercache/trickster/pkg/observability/logging"
)

var hups = make(chan os.Signal, 1)
Expand Down
4 changes: 2 additions & 2 deletions cmd/trickster/signal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"
"time"

"github.com/tricksterproxy/trickster/cmd/trickster/config"
"github.com/tricksterproxy/trickster/pkg/observability/logging"
"github.com/trickstercache/trickster/cmd/trickster/config"
"github.com/trickstercache/trickster/pkg/observability/logging"
)

func TestStartHupMonitor(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/trickster/usage.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"fmt"

"github.com/tricksterproxy/trickster/pkg/runtime"
"github.com/trickstercache/trickster/pkg/runtime"
)

const usageText = `
Expand Down Expand Up @@ -65,7 +65,7 @@ repository, Charts on Helm Hub, and standalone binaries on our GitHub releases p

Thank you for using and contributing to Open Source Software!

https://github.com/tricksterproxy/trickster
https://github.com/trickstercache/trickster
`

func version() string {
Expand Down
4 changes: 2 additions & 2 deletions cmd/trickster/usage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package main

import (
"github.com/tricksterproxy/trickster/pkg/runtime"
"github.com/trickstercache/trickster/pkg/runtime"
)

// ExamplePrintVersion tests the output of the printVersion() func
Expand Down Expand Up @@ -75,6 +75,6 @@ func ExamplePrintUsage() {
//
// Thank you for using and contributing to Open Source Software!
//
// https://github.com/tricksterproxy/trickster
// https://github.com/trickstercache/trickster
//
}
2 changes: 1 addition & 1 deletion deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Docker
---
```
$ docker run --name trickster -d [-v /path/to/trickster.yaml:/etc/trickster/trickster.yaml] -p 0.0.0.0:9090:9090 tricksterproxy/trickster:latest
$ docker run --name trickster -d [-v /path/to/trickster.yaml:/etc/trickster/trickster.yaml] -p 0.0.0.0:9090:9090 trickstercache/trickster:latest
```

## Kubernetes, Helm, RBAC
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Helm Charts

Trickster's Helm charts are located in their own project at <https://github.com/tricksterproxy/helm-charts/>. We welcome contributions to our charts.
Trickster's Helm charts are located in their own project at <https://github.com/trickstercache/helm-charts/>. We welcome contributions to our charts.

If you want to Install the Trickster charts, see <https://helm.tricksterproxy.io/> or search for Trickster on Helm Hub.
Loading