Docs and make file nits (#1731)

Dockerfile.fluentbit

@@ -1,9 +1,8 @@
 FROM registry.access.redhat.com/ubi7/ubi-minimal
 ARG VERSION
-RUN \
-  echo -e '[td-agent-bit]\nname=td-agent-bit\nbaseurl=https://packages.fluentbit.io/centos/7/$basearch' >/etc/yum.repos.d/td-agent-bit.repo && \
-  rpm --import https://packages.fluentbit.io/fluentbit.key && \
-  microdnf update && \
-  microdnf install td-agent-bit-$VERSION && \
-  microdnf clean all
+RUN echo -e '[td-agent-bit]\nname=td-agent-bit\nbaseurl=https://packages.fluentbit.io/centos/7/$basearch' >/etc/yum.repos.d/td-agent-bit.repo && \
+    rpm --import https://packages.fluentbit.io/fluentbit.key
+RUN microdnf update
+RUN microdnf install td-agent-bit-$VERSION
+RUN microdnf clean all
 ENTRYPOINT ["/opt/td-agent-bit/bin/td-agent-bit"]

Makefile

@@ -4,6 +4,7 @@ ARO_IMAGE ?= ${RP_IMAGE_ACR}.azurecr.io/aro:$(COMMIT)
 
 # fluentbit version must also be updated in RP code, see pkg/util/version/const.go
 FLUENTBIT_VERSION = 1.8.9-1
+FLUENTBIT_IMAGE ?= ${RP_IMAGE_ACR}.azurecr.io/fluentbit:$(FLUENTBIT_VERSION)
 AUTOREST_VERSION = 3.3.2
 AUTOREST_IMAGE = "quay.io/openshift-on-azure/autorest:${AUTOREST_VERSION}"
 
@@ -53,18 +54,18 @@ generate:
 
 image-aro: aro e2e.test
 	docker pull registry.access.redhat.com/ubi8/ubi-minimal
-	docker build --no-cache -f Dockerfile.aro -t $(ARO_IMAGE) .
+	docker build --network=host --no-cache -f Dockerfile.aro -t $(ARO_IMAGE) .
 
 image-aro-multistage:
-	docker build --no-cache -f Dockerfile.aro-multistage -t $(ARO_IMAGE) .
+	docker build --network=host --no-cache -f Dockerfile.aro-multistage -t $(ARO_IMAGE) .
 
 image-autorest:
-	docker build --no-cache --build-arg AUTOREST_VERSION="${AUTOREST_VERSION}" \
+	docker build --network=host --no-cache --build-arg AUTOREST_VERSION="${AUTOREST_VERSION}" \
 	  -f Dockerfile.autorest -t ${AUTOREST_IMAGE} .
 
 image-fluentbit:
-	docker build --no-cache --build-arg VERSION=$(FLUENTBIT_VERSION) \
-	  -f Dockerfile.fluentbit -t ${RP_IMAGE_ACR}.azurecr.io/fluentbit:$(FLUENTBIT_VERSION) .
+	docker build --network=host --no-cache --build-arg VERSION=$(FLUENTBIT_VERSION) \
+	  -f Dockerfile.fluentbit -t $(FLUENTBIT_IMAGE) .
 
 image-proxy: proxy
 	docker pull registry.access.redhat.com/ubi8/ubi-minimal
@@ -88,7 +89,7 @@ publish-image-autorest: image-autorest
 	docker push ${AUTOREST_IMAGE}
 
 publish-image-fluentbit: image-fluentbit
-	docker push ${RP_IMAGE_ACR}.azurecr.io/fluentbit:$(FLUENTBIT_VERSION)
+	docker push $(FLUENTBIT_IMAGE)
 
 publish-image-proxy: image-proxy
 	docker push ${RP_IMAGE_ACR}.azurecr.io/proxy:latest

docs/deploy-full-rp-service-in-dev.md

@@ -34,6 +34,7 @@
     export DATABASE_NAME=ARO
     export KEYVAULT_PREFIX=$USER-aro-$LOCATION
     export ARO_IMAGE=${USER}aro.azurecr.io/aro:$(git rev-parse --short=7 HEAD)$([[ $(git status --porcelain) = "" ]] || echo -dirty)
+    export FLUENTBIT_IMAGE=${USER}aro.azurecr.io/fluentbit:latest
     ```
 
     ```bash
@@ -42,6 +43,7 @@
 
 1. Run `make deploy`
     > __NOTE:__ This will fail on the first attempt to run due to certificate and container mirroring requirements.
+    > __NOTE:__ If you reuse an old name, you might run into soft-delete of the keyvaults. `az keyvault recover --name` to fix this.
 
 <!-- TODO: this is almost duplicated elsewhere.  Would be nice to move to common area -->
 1. Update the certificates in keyvault
@@ -99,7 +101,7 @@
     1. Setup mirroring environment variables
         ```bash
         export DST_ACR_NAME=${USER}aro
-        export SRC_AUTH_QUAY=FILL_IN # Get quay auth https://cloud.redhat.com/openshift/create/local -> Download Pull Secret
+        export SRC_AUTH_QUAY=FILL_IN # Get quay auth https://cloud.redhat.com/openshift/create/local -> Download Pull Secret. Use base64 value from quay.io part
         export SRC_AUTH_REDHAT=$(echo $USER_PULL_SECRET | jq -r '.auths."registry.redhat.io".auth')
         export DST_AUTH=$(echo -n '00000000-0000-0000-0000-000000000000:'$(az acr login -n ${DST_ACR_NAME} --expose-token | jq -r .accessToken) | base64 -w0)