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

replace all mozilla/sops with getsops/sops #407

Merged
merged 2 commits into from
Sep 17, 2023
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `secrets+*-import://` added syntax checks

### Fixed
- Multiline parameter values
- Multiline parameter values
- Change all mozilla/sops to getsops/mozilla (https://github.com/getsops/sops/issues/1246)

## [4.5.0] - 2023-08-14

Expand Down Expand Up @@ -164,7 +165,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [3.10.0] - 2021-11-05
### Added
- Add [age](https://github.com/mozilla/sops#encrypting-using-age) support for downloader plugin syntax.
- Add [age](https://github.com/getsops/sops#encrypting-using-age) support for downloader plugin syntax.

### Changed
- Improvements to the ArgoCD integration documentation.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ENV HOME=/home/user/

RUN if [ "$(uname -m)" == "x86_64" ]; then CURL_ARCH=amd64; GO_ARCH=amd64; else CURL_ARCH="aarch64" GO_ARCH="arm64"; fi \
&& apk add --no-cache gnupg curl && adduser -D user \
&& wget -qO /usr/local/bin/sops https://github.com/mozilla/sops/releases/download/v${VERSION_SOPS}/sops-v${VERSION_SOPS}.linux.${GO_ARCH} \
&& wget -qO /usr/local/bin/sops https://github.com/getsops/sops/releases/download/v${VERSION_SOPS}/sops-v${VERSION_SOPS}.linux.${GO_ARCH} \
&& wget -qO /usr/local/bin/kubectl https://dl.k8s.io/release/v${VERSION_KUBECTL}/bin/linux/${GO_ARCH}/kubectl \
&& wget -qO - https://get.helm.sh/helm-v${VERSION_HELM}-linux-${GO_ARCH}.tar.gz | tar xzvf - -C /usr/local/bin/ --strip-components 1 "linux-${GO_ARCH}/helm" \
&& wget -qO - https://github.com/variantdev/vals/releases/download/v${VERSION_VALS}/vals_${VERSION_VALS}_linux_amd64.tar.gz | tar xzf - -C /usr/local/bin/ vals \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

helm-secrets is a Helm plugin for decrypt encrypted Helm **value files** on the fly.

* Use [sops](https://github.com/mozilla/sops) to encrypt value files and store them into git.
* Use [sops](https://github.com/getsops/sops) to encrypt value files and store them into git.
* Store your secrets a cloud native secret manager like AWS SecretManager, Azure KeyVault or HashiCorp Vault and inject them inside value files or templates.
* Use helm-secret in your favorite deployment tool or GitOps Operator like ArgoCD

Expand Down Expand Up @@ -142,7 +142,7 @@ An example of how to use helm-secrets with Terraform could be found in [examples
## Secret backends

helm-secrets support multiple secret backends.
Currently, [sops](https://github.com/mozilla/sops) and [vals](https://github.com/variantdev/vals/) are supported.
Currently, [sops](https://github.com/getsops/sops) and [vals](https://github.com/variantdev/vals/) are supported.

See [Secret-Backends](https://github.com/jkroepke/helm-secrets/wiki/Secret-Backends) how to use them.

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- >-
apt-get update
&& apt-get install git gnupg ruby curl -y
&& curl -sSfL https://github.com/mozilla/sops/releases/download/v3.7.2/sops-v3.7.2.linux -o /usr/local/bin/sops
&& curl -sSfL https://github.com/getsops/sops/releases/download/v3.7.2/sops-v3.7.2.linux -o /usr/local/bin/sops
&& curl -sSfL https://releases.hashicorp.com/vault/1.10.1/vault_1.10.1_linux_amd64.zip -o /tmp/vault.zip && unzip /tmp/vault.zip && mv vault /usr/local/bin
&& curl -sSfL https://get.helm.sh/helm-v3.7.0-linux-amd64.tar.gz | tar zxf - -C /usr/local/bin/ --strip-components 1 linux-amd64/helm
&& chmod +x /usr/local/bin/*
Expand Down
12 changes: 6 additions & 6 deletions docs/ArgoCD Integration.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Argo CD Integration

Before starting to integrate helm-secrets with ArgoCD, consider using [age](https://github.com/FiloSottile/age/) over gpg.
[It's recommended to use age encryption over GPG, if possible.](https://github.com/mozilla/sops#encrypting-using-age)
[It's recommended to use age encryption over GPG, if possible.](https://github.com/getsops/sops#encrypting-using-age)

Since ArgoCD is a shared environment,
consider reading [Security in shared environments](https://github.com/jkroepke/helm-secrets/wiki/Security-in-shared-environments)
Expand All @@ -14,7 +14,7 @@ to prevent users from reading files outside the own directory.
- ArgoCD 2.3.0+, 2.2.6+, 2.1.11+ (ArgoCD 2.1.9, 2.1.10, 2.2.4, 2.2.5 is [NOT compatible with helm-secrets](https://github.com/argoproj/argo-cd/issues/8397))
- Multi-source applications requires at least helm-secrets [4.4.0](https://github.com/jkroepke/helm-secrets/releases/tag/v4.4.0) and some special [instructions](#multi-source-application-support-beta)!
- helm-secrets [3.9.x](https://github.com/jkroepke/helm-secrets/releases/tag/v3.9.1) or higher.
- age encrypted values requires at least [3.10.0](https://github.com/jkroepke/helm-secrets/releases/tag/v3.10.0) and sops [3.7.0](https://github.com/mozilla/sops/releases/tag/v3.7.0)
- age encrypted values requires at least [3.10.0](https://github.com/jkroepke/helm-secrets/releases/tag/v3.10.0) and sops [3.7.0](https://github.com/getsops/sops/releases/tag/v3.7.0)

# Usage

Expand Down Expand Up @@ -174,7 +174,7 @@ RUN curl -fsSL https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kub
-o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl

# sops backend installation (optional)
RUN curl -fsSL https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux \
RUN curl -fsSL https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux \
-o /usr/local/bin/sops && chmod +x /usr/local/bin/sops

# vals backend installation (optional)
Expand Down Expand Up @@ -270,7 +270,7 @@ repoServer:
wget -qO- https://github.com/jkroepke/helm-secrets/releases/download/v${HELM_SECRETS_VERSION}/helm-secrets.tar.gz | tar -C /custom-tools/helm-plugins -xzf-;

wget -qO /custom-tools/curl https://github.com/moparisthebest/static-curl/releases/latest/download/curl-amd64
wget -qO /custom-tools/sops https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux
wget -qO /custom-tools/sops https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux
wget -qO /custom-tools/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl

wget -qO- https://github.com/helmfile/vals/releases/download/v${VALS_VERSION}/vals_${VALS_VERSION}_linux_amd64.tar.gz | tar -xzf- -C /custom-tools/ vals;
Expand Down Expand Up @@ -344,7 +344,7 @@ When asked to enter a password, you need to omit it.

Please also note that currently it is recommended to use the --rfc4880.
This prevents you from running into a compatibility issue between gpg 2.2 and gpg 2.3
(Related Issue: [Encryption with GnuPG 2.3 (RFC4880bis) causes compatibility issues with GnuPG 2.2](https://github.com/mozilla/sops/issues/896))
(Related Issue: [Encryption with GnuPG 2.3 (RFC4880bis) causes compatibility issues with GnuPG 2.2](https://github.com/getsops/sops/issues/896))

```bash
gpg --armor --export-secret-keys <key-id> > key.asc
Expand All @@ -363,7 +363,7 @@ age-keygen -o key.txt
```

The public key can be found in the output of the generate-key command.
Unlike gpg, age does not have an agent. [To encrypt the key with sops](https://github.com/mozilla/sops#encrypting-using-age), set the environment variables
Unlike gpg, age does not have an agent. [To encrypt the key with sops](https://github.com/getsops/sops#encrypting-using-age), set the environment variables

* `SOPS_AGE_KEY_FILE="path/age/key.txt"`
* `SOPS_AGE_RECIPIENTS=public-key`
Expand Down
2 changes: 1 addition & 1 deletion docs/Cloud Integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ That's it! You should see the resulting content from the template.
- [AWS S3](https://github.com/variantdev/vals/blob/main/README.md#aws-s3)
- [GCP Secrets Manager](https://github.com/variantdev/vals/blob/main/README.md#gcp-secrets-manager)
- [Google GCS](https://github.com/variantdev/vals/blob/main/README.md#google-gcs)
- [SOPS](https://github.com/variantdev/vals/blob/main/README.md#sops) powered by [sops](https://github.com/mozilla/sops)
- [SOPS](https://github.com/variantdev/vals/blob/main/README.md#sops) powered by [sops](https://github.com/getsops/sops)
- [Terraform (tfstate)](https://github.com/variantdev/vals/blob/main/README.md#terraform-tfstate) powered by [tfstate-lookup](https://github.com/fujiwara/tfstate-lookup)
- [Echo](https://github.com/variantdev/vals/blob/main/README.md#echo)
- [File](https://github.com/variantdev/vals/blob/main/README.md#file)
Expand Down
2 changes: 1 addition & 1 deletion docs/Known Issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Error:
```
Error decrypting tree: Error walking tree: Could not decrypt value: crypto/aes: invalid key size 0
```
For possible workarounds see [Issue 1](https://github.com/jkroepke/helm-secrets/issues/158) and [Issue 2](https://github.com/mozilla/sops/issues/896)
For possible workarounds see [Issue 1](https://github.com/jkroepke/helm-secrets/issues/158) and [Issue 2](https://github.com/getsops/sops/issues/896)
6 changes: 3 additions & 3 deletions docs/Secret Backends.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Secret Backends

helm-secret support multiple backend. [sops](https://github.com/mozilla/sops) and [vals](https://github.com/variantdev/vals).
helm-secret support multiple backend. [sops](https://github.com/getsops/sops) and [vals](https://github.com/variantdev/vals).
sops is good for on-premise installation. vals can be used to fetch secrets from external systems like AWS Secrets Manager or Azure KeyVault.

Example for in-tree backends via an CLI option
Expand Down Expand Up @@ -70,9 +70,9 @@ HELM_SECRETS_VALS_PATH=/custom/location/vals helm secrets decrypt ./tests/assets
If you use sops with helm-secrets, the sops CLI tool is needed.
sops 3.2.0 is required at a minimum.

Download: https://github.com/mozilla/sops/releases/latest
Download: https://github.com/getsops/sops/releases/latest

Before starting using sops with gpg, consider starting to use [age](https://github.com/mozilla/sops#encrypting-using-age).
Before starting using sops with gpg, consider starting to use [age](https://github.com/getsops/sops#encrypting-using-age).

The sops secret store is enabled by default.

Expand Down
4 changes: 2 additions & 2 deletions docs/Usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ helm-secrets is a helm plugin for decrypt encrypted helm value files on the fly.
For more information, see the README.md at https://github.com/jkroepke/helm-secrets

To decrypt/encrypt/edit locally you need to initialize/first encrypt secrets with
sops - https://github.com/mozilla/sops
sops - https://github.com/getsops/sops

Available Commands:
encrypt Encrypt secrets file
Expand Down Expand Up @@ -154,7 +154,7 @@ creation_rules:
- pgp: '000111122223333444AAAADDDDFFFFGGGG000999'

```
For more help look at https://github.com/mozilla/sops
For more help look at https://github.com/getsops/sops

Multiple KMS and PGP are allowed.

Expand Down
2 changes: 1 addition & 1 deletion examples/argo-cd/setup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ argo-cd:
mkdir -p /custom-tools/helm-plugins
wget -qO- https://github.com/jkroepke/helm-secrets/releases/download/v${HELM_SECRETS_VERSION}/helm-secrets.tar.gz | tar -C /custom-tools/helm-plugins -xzf-;

wget -qO /custom-tools/sops https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux
wget -qO /custom-tools/sops https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux
wget -qO /custom-tools/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl

wget -qO- https://github.com/variantdev/vals/releases/download/v${VALS_VERSION}/vals_${VALS_VERSION}_linux_amd64.tar.gz | tar -xzf- -C /custom-tools/ vals;
Expand Down
2 changes: 1 addition & 1 deletion scripts/commands/decrypt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Decrypt secrets

It uses your gpg credentials to decrypt previously encrypted values file.

You can use plain sops to decrypt specific files - https://github.com/mozilla/sops
You can use plain sops to decrypt specific files - https://github.com/getsops/sops

Typical usage:
$ helm secrets dec secrets/project/secrets.yaml
Expand Down
2 changes: 1 addition & 1 deletion scripts/commands/edit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Edit encrypted secrets

Decrypt encrypted file, edit and then encrypt

You can use plain sops to edit - https://github.com/mozilla/sops
You can use plain sops to edit - https://github.com/getsops/sops

Example:
$ helm secrets edit <SECRET_FILE_PATH>
Expand Down
2 changes: 1 addition & 1 deletion scripts/commands/encrypt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ It uses your gpg credentials to encrypt .yaml file. If the file is already
encrypted, look for a decrypted file and encrypt that to .yaml.
This allows you to first decrypt the file, edit it, then encrypt it again.

You can use plain sops to encrypt - https://github.com/mozilla/sops
You can use plain sops to encrypt - https://github.com/getsops/sops

Example:
$ helm secrets enc <SECRET_FILE_PATH>
Expand Down
2 changes: 1 addition & 1 deletion scripts/commands/help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ helm-secrets is a helm plugin for decrypt encrypted helm value files on the fly.
For more information, see the README.md at https://github.com/jkroepke/helm-secrets

To decrypt/encrypt/edit locally you need to initialize/first encrypt secrets with
sops - https://github.com/mozilla/sops
sops - https://github.com/getsops/sops

Available Commands:
encrypt Encrypt secrets file
Expand Down
4 changes: 2 additions & 2 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ Then follow the installation instruction for bats here: https://github.com/bats-
More information's here: https://github.com/bats-core/bats-core

### sops
Can be downloaded here: https://github.com/mozilla/sops/releases
Can be downloaded here: https://github.com/getsops/sops/releases

Alternately available via [homebrew](https://brew.sh/):

```bash
brew install sops
```

More information's here: https://github.com/mozilla/sops
More information's here: https://github.com/getsops/sops

### gpg
sops only non-public cloud encryption method based on gpg.
Expand Down
2 changes: 1 addition & 1 deletion tests/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG VERSION_SOPS=3.7.3
ARG VERSION_VALS=0.24.0

RUN apk add git curl gnupg ruby bash \
&& curl -sSfL https://github.com/mozilla/sops/releases/download/v${VERSION_SOPS}/sops-v${VERSION_SOPS}.linux -o /usr/local/bin/sops \
&& curl -sSfL https://github.com/getsops/sops/releases/download/v${VERSION_SOPS}/sops-v${VERSION_SOPS}.linux -o /usr/local/bin/sops \
&& chmod +x /usr/local/bin/sops \
&& curl -sSfL https://get.helm.sh/helm-v${VERSION_HELM}-linux-amd64.tar.gz | tar xzf - --strip-component 1 -C /usr/local/bin/ \
&& curl -sSfL https://github.com/variantdev/vals/releases/download/v${VERSION_VALS}/vals_${VERSION_VALS}_linux_amd64.tar.gz | tar xzf - -C /usr/local/bin/ vals \
Expand Down
2 changes: 1 addition & 1 deletion tests/ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG VERSION_SOPS=3.7.3
ARG VERSION_VALS=0.24.0

RUN apt-get update -qq && apt-get install -yqq git curl gnupg2 ruby \
&& curl -sSfL https://github.com/mozilla/sops/releases/download/v${VERSION_SOPS}/sops-v${VERSION_SOPS}.linux -o /usr/local/bin/sops \
&& curl -sSfL https://github.com/getsops/sops/releases/download/v${VERSION_SOPS}/sops-v${VERSION_SOPS}.linux -o /usr/local/bin/sops \
&& chmod +x /usr/local/bin/sops \
&& curl -sSfL https://get.helm.sh/helm-v${VERSION_HELM}-linux-amd64.tar.gz | tar xzf - --strip-component 1 -C /usr/local/bin/ --wildcards '*/helm' \
&& curl -sSfL https://github.com/variantdev/vals/releases/download/v${VERSION_VALS}/vals_${VERSION_VALS}_linux_amd64.tar.gz | tar xzf - -C /usr/local/bin/ vals \
Expand Down