Skip to content

Commit d81d987

Browse files
authored
chore: relocate to grafana (grafana#26)
Moves the repository from sh0rez to grafana, updates all old repo names
1 parent 79d6915 commit d81d987

16 files changed

+30
-30
lines changed

.drone/docker-manifest.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
image: shorez/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
1+
image: grafana/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
22
{{#if build.tags}}
33
tags:
44
{{#each build.tags}}
55
- {{this}}
66
{{/each}}
77
{{/if}}
88
manifests:
9-
- image: shorez/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
9+
- image: grafana/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
1010
platform:
1111
architecture: amd64
1212
os: linux
13-
- image: shorez/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
13+
- image: grafana/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm64
1414
platform:
1515
architecture: arm64
1616
os: linux
1717
variant: v8
18-
- image: shorez/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
18+
- image: grafana/tanka:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}arm
1919
platform:
2020
architecture: arm
2121
os: linux

.drone/drone.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ local docker(arch) = pipeline('docker-' + arch) {
4444
name: 'container',
4545
image: 'plugins/docker',
4646
settings: {
47-
repo: 'shorez/tanka',
47+
repo: 'grafana/tanka',
4848
auto_tag: true,
4949
auto_tag_suffix: arch,
5050
username: { from_secret: 'docker_username' },

.drone/drone.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ steps:
4848
api_key:
4949
from_secret: GITHUB_TOKEN
5050
files: dist/*
51-
note: 'This is release ${DRONE_VERSION} of Tanka (`tk`). Check out the [CHANGELOG](CHANGELOG.md)
51+
note: 'This is release ${DRONE_TAG} of Tanka (`tk`). Check out the [CHANGELOG](CHANGELOG.md)
5252
for detailed release notes.
5353
5454
## Install instructions
@@ -77,11 +77,11 @@ steps:
7777
7878
#### Docker container:
7979
80-
https://hub.docker.com/r/shorez/tanka
80+
https://hub.docker.com/r/grafana/tanka
8181
8282
```bash
8383
84-
$ docker pull shorez/tanka:${DRONE_TAG}
84+
$ docker pull grafana/tanka:${DRONE_TAG}
8585
8686
```
8787
@@ -116,7 +116,7 @@ steps:
116116
auto_tag_suffix: amd64
117117
password:
118118
from_secret: docker_password
119-
repo: shorez/tanka
119+
repo: grafana/tanka
120120
username:
121121
from_secret: docker_username
122122
trigger:
@@ -150,7 +150,7 @@ steps:
150150
auto_tag_suffix: arm
151151
password:
152152
from_secret: docker_password
153-
repo: shorez/tanka
153+
repo: grafana/tanka
154154
username:
155155
from_secret: docker_username
156156
trigger:
@@ -184,7 +184,7 @@ steps:
184184
auto_tag_suffix: arm64
185185
password:
186186
from_secret: docker_password
187-
repo: shorez/tanka
187+
repo: grafana/tanka
188188
username:
189189
from_secret: docker_username
190190
trigger:

.drone/release-note.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ tk --help
1414
```
1515

1616
#### Docker container:
17-
https://hub.docker.com/r/shorez/tanka
17+
https://hub.docker.com/r/grafana/tanka
1818
```bash
19-
$ docker pull shorez/tanka:${DRONE_TAG}
19+
$ docker pull grafana/tanka:${DRONE_TAG}
2020
```

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2018 sh0rez
189+
Copyright 2018 grafana, sh0rez
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cross: $(GOX)
2525

2626
# Docker container
2727
container: static
28-
docker build -t shorez/tanka .
28+
docker build -t grafana/tanka .
2929

3030
# CI
3131
drone:

cmd/tk/init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"log"
77
"os"
88

9-
"github.com/sh0rez/tanka/pkg/config/v1alpha1"
9+
"github.com/grafana/tanka/pkg/config/v1alpha1"
1010
"github.com/spf13/cobra"
1111
)
1212

cmd/tk/jsonnet.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"log"
77
"path/filepath"
88

9+
"github.com/grafana/tanka/pkg/jpath"
10+
"github.com/grafana/tanka/pkg/jsonnet"
911
"github.com/pkg/errors"
10-
"github.com/sh0rez/tanka/pkg/jpath"
11-
"github.com/sh0rez/tanka/pkg/jsonnet"
1212
"github.com/spf13/cobra"
1313
)
1414

cmd/tk/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/spf13/cobra"
1010
"github.com/spf13/viper"
1111

12-
"github.com/sh0rez/tanka/pkg/cmp"
13-
"github.com/sh0rez/tanka/pkg/config/v1alpha1"
14-
"github.com/sh0rez/tanka/pkg/kubernetes"
12+
"github.com/grafana/tanka/pkg/cmp"
13+
"github.com/grafana/tanka/pkg/config/v1alpha1"
14+
"github.com/grafana/tanka/pkg/kubernetes"
1515
)
1616

1717
// Version is the current version of the tk command.

cmd/tk/other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/sh0rez/tanka/pkg/jpath"
8+
"github.com/grafana/tanka/pkg/jpath"
99
)
1010

1111
// findBaseDirs searches for possible environments

cmd/tk/tool.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
"github.com/spf13/cobra"
1414

15-
"github.com/sh0rez/tanka/pkg/jpath"
16-
"github.com/sh0rez/tanka/pkg/jsonnet"
15+
"github.com/grafana/tanka/pkg/jpath"
16+
"github.com/grafana/tanka/pkg/jsonnet"
1717
)
1818

1919
func toolCmd() *cobra.Command {

cmd/tk/workflow.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77

88
"github.com/alecthomas/chroma/quick"
9+
"github.com/grafana/tanka/pkg/cmp"
910
"github.com/posener/complete"
10-
"github.com/sh0rez/tanka/pkg/cmp"
1111
"github.com/spf13/cobra"
1212
"golang.org/x/crypto/ssh/terminal"
1313
)

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/sh0rez/tanka
1+
module github.com/grafana/tanka
22

33
go 1.12
44

pkg/jsonnet/jsonnet.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"io/ioutil"
55
"path/filepath"
66

7+
"github.com/grafana/tanka/pkg/jpath"
8+
"github.com/grafana/tanka/pkg/native"
79
"github.com/pkg/errors"
8-
"github.com/sh0rez/tanka/pkg/jpath"
9-
"github.com/sh0rez/tanka/pkg/native"
1010

1111
jsonnet "github.com/sh0rez/go-jsonnet"
1212
)

pkg/kubernetes/kubernetes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/stretchr/objx"
99
yaml "gopkg.in/yaml.v2"
1010

11-
"github.com/sh0rez/tanka/pkg/config/v1alpha1"
11+
"github.com/grafana/tanka/pkg/config/v1alpha1"
1212
)
1313

1414
// Kubernetes bridges tanka to the Kubernetse orchestrator.

pkg/kubernetes/subsetdiff.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/stretchr/objx"
1010
yaml "gopkg.in/yaml.v2"
1111

12-
"github.com/sh0rez/tanka/pkg/util"
12+
"github.com/grafana/tanka/pkg/util"
1313
)
1414

1515
type difference struct {

0 commit comments

Comments
 (0)