Skip to content

Commit

Permalink
Update README / Revert Legacy README Changes (#186)
Browse files Browse the repository at this point in the history
* fix: revert changes to legacy README

* docs: update README to support new version of dockerfile
  • Loading branch information
devstein committed May 18, 2023
1 parent 93f4220 commit a784f38
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
13 changes: 8 additions & 5 deletions README-legacy.md
Expand Up @@ -35,12 +35,14 @@ source $HOME/.zshrc
### Install the Latest Release

Using curl

```bash
# Verify the $XDG_CONFIG_HOME environment variable exists then run
curl -s https://raw.githubusercontent.com/viaduct-ai/kustomize-sops/master/scripts/install-legacy-ksops-archive.sh | bash
```

Or using wget

```bash
# Verify the $XDG_CONFIG_HOME environment variable exists then run
wget -qcO - https://raw.githubusercontent.com/viaduct-ai/kustomize-sops/master/scripts/install-legacy-ksops-archive.sh | bash
Expand Down Expand Up @@ -206,6 +208,7 @@ secretFrom:
- secret.yaml=./secret.enc.yaml
EOF
```

```bash
# Create a Kubernetes Secret from encrypted dotenv file
cat <<EOF > secret-generator.yaml
Expand Down Expand Up @@ -394,9 +397,9 @@ spec:
Alternatively, for more control and faster pod start times you can build a custom docker image.

```Dockerfile
ARG ARGO_CD_VERSION="v2.6.7"
ARG ARGO_CD_VERSION="v1.7.7"
# https://github.com/argoproj/argo-cd/blob/master/Dockerfile
ARG KSOPS_VERSION="v4.1.3"
ARG KSOPS_VERSION="v3.1.0"

#--------------------------------------------#
#--------Build KSOPS and Kustomize-----------#
Expand All @@ -420,10 +423,10 @@ ENV KUSTOMIZE_PLUGIN_PATH=$XDG_CONFIG_HOME/kustomize/plugin/
ARG PKG_NAME=ksops

# Override the default kustomize executable with the Go built version
COPY --from=ksops-builder /usr/local/bin/kustomize /usr/local/bin/kustomize
COPY --from=ksops-builder /go/bin/kustomize /usr/local/bin/kustomize

# Copy the plugin to kustomize plugin path
COPY --from=ksops-builder /usr/local/bin/ksops $KUSTOMIZE_PLUGIN_PATH/viaduct.ai/v1/${PKG_NAME}/
COPY --from=ksops-builder /go/bin/ksops $KUSTOMIZE_PLUGIN_PATH/viaduct.ai/v1/${PKG_NAME}/

# Switch back to non-root user
USER argocd
Expand Down Expand Up @@ -453,7 +456,7 @@ repoServer:

initContainers:
- name: install-ksops
image: viaductoss/ksops:v4.1.3
image: viaductoss/ksops:v3.1.0
command: ["/bin/sh", "-c"]
args:
- echo "Installing KSOPS...";
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -396,7 +396,7 @@ spec:
Alternatively, for more control and faster pod start times you can build a custom docker image.

```Dockerfile
ARG ARGO_CD_VERSION="v1.7.7"
ARG ARGO_CD_VERSION="v2.6.7"
# https://github.com/argoproj/argo-cd/blob/master/Dockerfile
ARG KSOPS_VERSION="v4.1.3"

Expand All @@ -418,10 +418,10 @@ USER root
ARG PKG_NAME=ksops

# Override the default kustomize executable with the Go built version
COPY --from=ksops-builder /go/bin/kustomize /usr/local/bin/kustomize
COPY --from=ksops-builder /usr/local/bin/kustomize /usr/local/bin/kustomize

# Add ksops executable to path
COPY --from=ksops-builder /go/bin/ksops /usr/local/bin/ksops
COPY --from=ksops-builder /usr/local/bin/ksops /usr/local/bin/ksops

# Switch back to non-root user
USER argocd
Expand Down

0 comments on commit a784f38

Please sign in to comment.