Skip to content

Commit

Permalink
Merge pull request #23 from anguslees/rename
Browse files Browse the repository at this point in the history
Rename everything :)

Rename repo ksonnet/sealed-secrets -> bitnami/sealed-secrets
Rename SealedSecret apiGroup ksonnet.io -> bitnami.com
Rename cli tool ksonnet-seal -> kubeseal
The project was always more generally applicable than just the ksonnet context, and the new home makes that clearer. The good news is that we did this early, minimising the impact on existing deployments.
  • Loading branch information
anguslees authored Jun 21, 2017
2 parents c2975d7 + 943cb5a commit e1279c1
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.glide/

/controller
/ksonnet-seal
/kubeseal
/controller.image
/*-static
/controller.yaml
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ os:

env:
global:
- CONTROLLER_IMAGE_NAME=quay.io/ksonnet/sealed-secrets-controller
- CONTROLLER_IMAGE_NAME=quay.io/bitnami/sealed-secrets-controller
- CONTROLLER_IMAGE=${CONTROLLER_IMAGE_NAME}:${TRAVIS_TAG:-build-$TRAVIS_BUILD_ID}

before_install:
Expand All @@ -32,9 +32,9 @@ script:
- make
- make test
- make vet
- make ksonnet-seal-static
- EXE_NAME=ksonnet-seal-$(go env GOOS)-$(go env GOARCH)
- cp ksonnet-seal-static $EXE_NAME
- make kubeseal-static
- EXE_NAME=kubeseal-$(go env GOOS)-$(go env GOARCH)
- cp kubeseal-static $EXE_NAME
- ./$EXE_NAME --help || test $? -eq 2
- |
if [ "$TRAVIS_OS_NAME" = linux ]; then
Expand Down Expand Up @@ -63,7 +63,7 @@ before_deploy:
deploy:
api_key:
secure: f2TxbMzYpq4u/5/B3oJdr7qNdBcTWflWG/SUATPnlIm0IUXKnHNS22MQerL27CNi7Ijg/ecVaWoDuqPwTBKqf1pAaM62JSID/7Y2DzkfvytJ5hCN1ifVYr/MrQJYPrQN49RstBPp7JHe4D+Tm75iVeI2pJEX8RmWBOXKxTp+XaFXymBM0O4qE8GybjRW9X8wXQLuvvH1mnAWGC+hROqYQEAi7JKRTTE8InA22aF73KucJM4FcskRrqSNcdtsMP5Jhlx7OgBnmSNidemYmTrshq7G6pburJjK0bl4mWPnce/4zaPVlTdLlQghn0cIogZ8M3RVwTBjOOsqiKDDhkKihsTWM1ghgtLN+FVpCSVvpwUjBkyatRE1cZk7aXg6xCADcCGQjB8rTveVauusCYm5n5EYFIcXSlZDxFvzVlBcJ2Z4tIHtqDKCd+5okf6AxfCj2bludGyzXVd5f2cqswU+duMVTJCOgaQ9PJc0RLHjvU/vKXkv9uS+1ZaKYlMZrJQD3IR6RIHsazIDVWmfKY8jICDjsIhMJHcc7HqThz3I8P82/o6TJbBDiAiANDD1MlXi+n1Epa6UTxglIdxntFm8CvwKlS+agJSkmLPCNxoENyvu1HRZOe8jW7itjRxxS5+q0jnxbuYLHtRm8kqQb8GYpiRD1UsMJv/ylfKnhd2Epp4=
secure: Bp7TwgtJVDnYSwXAP7uRHN1uXGILOvOASNDGHJI69GB+lG0RU6zqdOQJw8kKWjA67cKSW8RIuQuVlRsuNce3xa9sh1pB4OVZEJGoOiZrLVCM9s+iACuGjuKJB/GYLDDHhZYUTHp6o2Fymud9XhgqU/zpo/vAeVOTlGpj09dwZ0ZHAhivrx9Ubruo5uBgOe/nIcSDnQ9u5if0TOK4rg3EtxFf1ihiu6UXxZKjdi0Hqow8sQOjtqg82iAgpWwYRSIL4ePWear2FpnNMfIvRIMe7DNZvZ6uE9t/wkbLPOlTKSmkYw2YqOw4BvnDa7s8XcsOEzJHvyLh8sSrRFNR2VEiGuGDUPKJEpTJ+88ay7aeN0OLopAxMY0eTECWEKpFIJj6T48PoudevnT+HEBkvy4EkM4zEaf1HATMkZHUIL9qLY//hdMA2/usptLfZMqA2Ouj80Tpzr0AQ1u0QF7CYZt5Ga3YBoCt7yXfhKJ3w5i5EcObTcZBKXi5ScGdri3KfkB1CUuGrp1e/QDo1VWkLhoIGCJvCZnZGH7qDCH8gGyxWvIWTEro+yhmUg+I8786lqDzWLFKCA3NGf0b1W7nvI4pmsGRG5dIrWmpSUfaIJRDqi5R8Nj5S+VV3sdq/bT8+4n4yHcZnDQKdoCjO6K/WBTYBiq8igCIJ3obaWeH8i/XHLg=
file:
- $EXE_NAME
- controller.yaml
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ CONTROLLER_IMAGE = sealed-secrets-controller:latest
GO_PACKAGES = ./cmd/... ./apis/...
GO_FILES := $(shell find $(shell $(GO) list -f '{{.Dir}}' $(GO_PACKAGES)) -name \*.go)

all: controller ksonnet-seal
all: controller kubeseal

controller: $(GO_FILES)
$(GO) build -o $@ $(GO_FLAGS) ./cmd/controller

ksonnet-seal: $(GO_FILES)
$(GO) build -o $@ $(GO_FLAGS) ./cmd/ksonnet-seal
kubeseal: $(GO_FILES)
$(GO) build -o $@ $(GO_FLAGS) ./cmd/kubeseal

%-static: $(GO_FILES)
CGO_ENABLED=0 $(GO) build -o $@ -installsuffix cgo $(GO_FLAGS) ./cmd/$*
Expand Down Expand Up @@ -49,7 +49,7 @@ fmt:
$(GOFMT) -s -w $(GO_FILES)

clean:
$(RM) ./controller ./ksonnet-seal
$(RM) ./controller ./kubeseal
$(RM) *-static
$(RM) docker/controller

Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# "Sealed Secrets" for Kubernetes

[![Build Status](https://travis-ci.org/ksonnet/sealed-secrets.svg?branch=master)](https://travis-ci.org/ksonnet/sealed-secrets)
[![Build Status](https://travis-ci.org/bitnami/sealed-secrets.svg?branch=master)](https://travis-ci.org/bitnami/sealed-secrets)

**Problem:** "I can manage all my K8s config in git, except Secrets."

Expand All @@ -12,20 +12,20 @@ original Secret from the SealedSecret.

## Installation

See https://github.com/ksonnet/sealed-secrets/releases for the latest
See https://github.com/bitnami/sealed-secrets/releases for the latest
release.

```sh
$ release=$(curl --silent "https://api.github.com/repos/ksonnet/sealed-secrets/releases/latest" | sed -n 's/.*"tag_name": *"\([^"]*\)".*/\1/p')
$ release=$(curl --silent "https://api.github.com/repos/bitnami/sealed-secrets/releases/latest" | sed -n 's/.*"tag_name": *"\([^"]*\)".*/\1/p')

# Install client-side tool into /usr/local/bin/
$ GOOS=$(go env GOOS)
$ GOARCH=$(go env GOARCH)
$ wget https://github.com/ksonnet/sealed-secrets/releases/download/$release/ksonnet-seal-$GOOS-$GOARCH
$ sudo install -m 755 ksonnet-seal-$GOOS-$GOARCH /usr/local/bin/ksonnet-seal
$ wget https://github.com/bitnami/sealed-secrets/releases/download/$release/kubeseal-$GOOS-$GOARCH
$ sudo install -m 755 kubeseal-$GOOS-$GOARCH /usr/local/bin/kubeseal

# Install server-side controller into kube-system namespace (by default)
$ kubectl create -f https://github.com/ksonnet/sealed-secrets/releases/download/$release/controller.yaml
$ kubectl create -f https://github.com/bitnami/sealed-secrets/releases/download/$release/controller.yaml
```

`controller.yaml` will create the `SealedSecret` third-party-resource,
Expand All @@ -37,11 +37,11 @@ and be ready for operation. If it does not, check the controller
logs.

The key certificate (public key portion) is used for sealing secrets,
and needs to be available wherever `ksonnet-seal` is going to be
and needs to be available wherever `kubeseal` is going to be
used. The certificate is not secret information, although you need to
ensure you are using the correct file.

`ksonnet-seal` will fetch the certificate from the controller at
`kubeseal` will fetch the certificate from the controller at
runtime (requires secure access to the Kubernetes API server), but can
also be read from a local file for offline situations (eg: automated
jobs). The certificate is also printed to the controller log on
Expand All @@ -53,14 +53,14 @@ If you just want the latest client tool, it can be installed into
`$GOPATH/bin` with:

```sh
% go get github.com/ksonnet/sealed-secrets/cmd/ksonnet-seal
% go get github.com/bitnami/sealed-secrets/cmd/kubeseal
```

For a more complete development environment, clone the repository and
use the Makefile:

```sh
% git clone https://github.com/ksonnet/sealed-secrets.git
% git clone https://github.com/bitnami/sealed-secrets.git
% cd sealed-secrets

# Build client-side tool and controller binaries
Expand All @@ -71,7 +71,7 @@ use the Makefile:

```sh
# This is the important bit:
$ ksonnet-seal <mysecret.json >mysealedsecret.json
$ kubeseal <mysecret.json >mysealedsecret.json

# mysealedsecret.json is safe to upload to github, post to twitter,
# etc. Eventually:
Expand All @@ -83,7 +83,7 @@ $ kubectl get secret mysecret

Note the `SealedSecret` and `Secret` must have *the same namespace and
name*. This is a feature to prevent other users on the same cluster
from re-using your sealed secrets. `ksonnet-seal` reads the namespace
from re-using your sealed secrets. `kubeseal` reads the namespace
from the input secret, accepts an explicit `--namespace` arg, and uses
the `kubectl` default namespace (in that order). Any labels,
annotations, etc on the original `Secret` are preserved, but not
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

// GroupName is the group name used in this package
const GroupName = "ksonnet.io"
const GroupName = "bitnami.com"

var (
// SchemeGroupVersion is the group version used to register these objects
Expand Down
2 changes: 1 addition & 1 deletion cmd/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"

ssv1alpha1 "github.com/ksonnet/sealed-secrets/apis/v1alpha1"
ssv1alpha1 "github.com/bitnami/sealed-secrets/apis/v1alpha1"
)

const maxRetries = 5
Expand Down
2 changes: 1 addition & 1 deletion cmd/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"k8s.io/client-go/rest"
certUtil "k8s.io/client-go/util/cert"

ssv1alpha1 "github.com/ksonnet/sealed-secrets/apis/v1alpha1"
ssv1alpha1 "github.com/bitnami/sealed-secrets/apis/v1alpha1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/ksonnet-seal/main.go → cmd/kubeseal/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/cert"

ssv1alpha1 "github.com/ksonnet/sealed-secrets/apis/v1alpha1"
ssv1alpha1 "github.com/bitnami/sealed-secrets/apis/v1alpha1"

// Register v1.Secret type
_ "k8s.io/client-go/pkg/api/install"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1"

ssv1alpha1 "github.com/ksonnet/sealed-secrets/apis/v1alpha1"
ssv1alpha1 "github.com/bitnami/sealed-secrets/apis/v1alpha1"
)

const testCert = `
Expand Down
4 changes: 2 additions & 2 deletions controller.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ local labels = {name: "sealed-secrets-controller"};
local tpr = {
apiVersion: "extensions/v1beta1",
kind: "ThirdPartyResource",
metadata: objectMeta.name("sealed-secret.ksonnet.io"),
metadata: objectMeta.name("sealed-secret.bitnami.com"),
versions: [{name: "v1alpha1"}],
description: "A sealed (encrypted) Secret",
};
Expand All @@ -99,7 +99,7 @@ local controllerAccount =

local unsealerRole = clusterRole("secrets-unsealer", [
{
apiGroups: ["ksonnet.io"],
apiGroups: ["bitnami.com"],
resources: ["sealedsecrets"],
verbs: ["get", "list", "watch"],
},
Expand Down
2 changes: 1 addition & 1 deletion vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1315,5 +1315,5 @@
"versionExact": "v3.0.0-beta.0"
}
],
"rootPath": "github.com/ksonnet/sealed-secrets"
"rootPath": "github.com/bitnami/sealed-secrets"
}

0 comments on commit e1279c1

Please sign in to comment.