diff --git a/README.md b/README.md index 4f32d39d8..f4941b616 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ The apps are installed using a combination of helm charts and manifests with the - [helm-diff](https://github.com/databus23/helm-diff) (tested with 3.5.0) - [helm-secrets](https://github.com/futuresimple/helm-secrets) (tested with 3.12.0) - [jq](https://github.com/stedolan/jq) (tested with jq-1.6) -- [sops](https://github.com/mozilla/sops) (tested with 3.7.3) +- [sops](https://github.com/getsops/sops) (tested with 3.7.3) - [s3cmd](https://s3tools.org/s3cmd) available directly in Ubuntus repositories (tested with 2.0.1) - [yq4](https://github.com/mikefarah/yq) (tested with 4.26.1) - [pwgen](https://sourceforge.net/projects/pwgen/) available directly in Ubuntus repositories (tested with 2.08) @@ -85,7 +85,7 @@ See [DEVELOPMENT.md](DEVELOPMENT.md). ### :closed_lock_with_key: PGP :closed_lock_with_key: -Configuration secrets in ck8s are encrypted using [SOPS](https://github.com/mozilla/sops). +Configuration secrets in ck8s are encrypted using [SOPS](https://github.com/getsops/sops). We currently only support using PGP when encrypting secrets. Because of this, before you can start using ck8s, you need to generate your own PGP key: diff --git a/bin/common.bash b/bin/common.bash index 6194e3da0..1bf5223b4 100644 --- a/bin/common.bash +++ b/bin/common.bash @@ -469,7 +469,7 @@ sops_encrypt_stdin() { # Encrypt a file in place. sops_encrypt() { - # https://github.com/mozilla/sops/issues/460 + # https://github.com/getsops/sops/issues/460 if sops_check "${1}"; then log_info "Already encrypted ${1}" return @@ -487,7 +487,7 @@ sops_decrypt_verify() { exit 1 fi - # https://github.com/mozilla/sops/issues/460 + # https://github.com/getsops/sops/issues/460 if ! sops_check "${1}"; then log_error "NOT ENCRYPTED: ${1}" exit 1 diff --git a/pipeline/Dockerfile b/pipeline/Dockerfile index 334386f5b..fee3d3143 100644 --- a/pipeline/Dockerfile +++ b/pipeline/Dockerfile @@ -25,7 +25,7 @@ RUN wget --progress=dot:giga "https://github.com/yannh/kubeconform/releases/down # sops # NOTE: This needs to be installed before the helm-secrets plugin. ENV SOPS_VERSION="3.7.3" -RUN wget --progress=dot:giga "https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux" && \ +RUN wget --progress=dot:giga "https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux" && \ install -Tm 755 "sops-v${SOPS_VERSION}.linux" /usr/local/bin/sops && \ rm "sops-v${SOPS_VERSION}.linux" diff --git a/roles/get-requirements.yaml b/roles/get-requirements.yaml index 2a759c9ff..56d009b55 100644 --- a/roles/get-requirements.yaml +++ b/roles/get-requirements.yaml @@ -28,7 +28,7 @@ dest: "{{ install_path }}/jq" - command: sops version: "{{ sops_version }}" - url: https://github.com/mozilla/sops/releases/download/v{{ sops_version }}/sops-v{{ sops_version }}.linux + url: https://github.com/getsops/sops/releases/download/v{{ sops_version }}/sops-v{{ sops_version }}.linux dest: "{{ install_path }}/sops" - command: yq version: "{{ yq_version }}"