From 33aaf5bb45284edc91f46a8c4c2edd9effb9d0c0 Mon Sep 17 00:00:00 2001 From: Ciara Stacke <18287516+ciarams87@users.noreply.github.com> Date: Mon, 30 Aug 2021 10:29:30 +0100 Subject: [PATCH 1/2] Update manual installation docs to include tag checkout --- .gitignore | 1 + docs/manual-installation.md | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c0a7a54c..ddaa1373 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ testbin/* *.swp *.swo *~ +.vscode/ diff --git a/docs/manual-installation.md b/docs/manual-installation.md index 73f0d0f1..bff61391 100644 --- a/docs/manual-installation.md +++ b/docs/manual-installation.md @@ -1,17 +1,22 @@ # Manual installation -### 1. Deploy the operator - This will deploy the operator in the `nginx-ingress-operator-system` namespace. 1. Deploy the Operator and associated resources: - 1. To deploy the Operator and associated resources to an OpenShift environment, run: + 1. Clone the `nginx-ingress-operator` repo and checkout the latest stable tag: + ``` + git clone https://github.com/nginxinc/nginx-ingress-operator/ + cd nginx-ingress-operator/ + git checkout v0.3.0 + ``` + + 2. To deploy the Operator and associated resources to an OpenShift environment, run: ``` make openshift-deploy IMG=registry.connect.redhat.com/nginx/nginx-ingress-operator:0.3.0 ``` - 2. To deploy the Operator and associated resources to all other environments: + 3. Alternatively, to deploy the Operator and associated resources to all other environments: ``` make deploy IMG=nginx/nginx-ingress-operator:0.3.0 ``` From 64c8e3bfc0040ef268fb1d676d5fff9cb6a56dea Mon Sep 17 00:00:00 2001 From: Ciara Stacke <18287516+ciarams87@users.noreply.github.com> Date: Tue, 31 Aug 2021 09:45:11 +0100 Subject: [PATCH 2/2] Disable cache --- .github/workflows/ci.yml | 8 ++++++-- docs/manual-installation.md | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 014327c7..57062100 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,8 +102,9 @@ jobs: uses: docker/build-push-action@v2 with: context: '.' - cache-from: type=gha - cache-to: type=gha,mode=max + # Disable cache until https://github.com/docker/buildx/issues/681 is fixed + # cache-from: type=gha + # cache-to: type=gha,mode=max tags: nginx/nginx-ingress-operator:${{ github.sha }} push: false @@ -135,6 +136,9 @@ jobs: with: file: Dockerfile context: '.' + # Disable cache until https://github.com/docker/buildx/issues/681 is fixed + # cache-from: type=gha + # cache-to: type=gha,mode=max cache-from: type=gha cache-to: type=gha,mode=max tags: | diff --git a/docs/manual-installation.md b/docs/manual-installation.md index bff61391..9d963cb1 100644 --- a/docs/manual-installation.md +++ b/docs/manual-installation.md @@ -11,7 +11,7 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace. git checkout v0.3.0 ``` - 2. To deploy the Operator and associated resources to an OpenShift environment, run: + 2. `Openshift` To deploy the Operator and associated resources to an OpenShift environment, run: ``` make openshift-deploy IMG=registry.connect.redhat.com/nginx/nginx-ingress-operator:0.3.0 ```