Merge pull request #947 from jverce/fix/issue-931

Remove refs to `latest` container tags
etcd-io · Jan 17, 2025 · 5527ab4 · 5527ab4
2 parents 6447d04 + 545cd5e
commit 5527ab4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/content/en/docs/v3.4/op-guide/container.md b/content/en/docs/v3.4/op-guide/container.md
@@ -24,9 +24,11 @@ docker volume create --name etcd-data
 export DATA_DIR="etcd-data"
 ```
 
-Run the latest version of etcd:
+Run the latest version of etcd (`{{< param git_version_tag >}}` at the time of
+writing):
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=gcr.io/etcd-development/etcd
@@ -35,7 +37,7 @@ docker run \
   -p 2379:2379 \
   -p 2380:2380 \
   --volume=${DATA_DIR}:/etcd-data \
-  --name etcd ${REGISTRY}:latest \
+  --name etcd ${REGISTRY}:${ETCD_VERSION} \
   /usr/local/bin/etcd \
   --data-dir=/etcd-data --name node1 \
   --initial-advertise-peer-urls http://${NODE1}:2380 --listen-peer-urls http://0.0.0.0:2380 \
@@ -57,7 +59,7 @@ REGISTRY=quay.io/coreos/etcd
 REGISTRY=gcr.io/etcd-development/etcd
 
 # For each machine
-ETCD_VERSION=latest
+ETCD_VERSION={{< param git_version_tag >}}
 TOKEN=my-etcd-token
 CLUSTER_STATE=new
 NAME_1=etcd-node-0
@@ -130,6 +132,7 @@ To provision a 3 node etcd cluster on bare-metal, the examples in the [baremetal
 The etcd release container does not include default root certificates. To use HTTPS with certificates trusted by a root authority (e.g., for discovery), mount a certificate directory into the etcd container:
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=docker://gcr.io/etcd-development/etcd
@@ -138,13 +141,14 @@ rkt run \
   --insecure-options=image \
   --volume etcd-ssl-certs-bundle,kind=host,source=/etc/ssl/certs/ca-certificates.crt \
   --mount volume=etcd-ssl-certs-bundle,target=/etc/ssl/certs/ca-certificates.crt \
-  ${REGISTRY}:latest -- --name my-name \
+  ${REGISTRY}:${ETCD_VERSION} -- --name my-name \
   --initial-advertise-peer-urls http://localhost:2380 --listen-peer-urls http://localhost:2380 \
   --advertise-client-urls http://localhost:2379 --listen-client-urls http://localhost:2379 \
   --discovery https://discovery.etcd.io/c11fbcdc16972e45253491a24fcf45e1
 ```
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=gcr.io/etcd-development/etcd
@@ -153,7 +157,7 @@ docker run \
   -p 2379:2379 \
   -p 2380:2380 \
   --volume=/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \
-  ${REGISTRY}:latest \
+  ${REGISTRY}:${ETCD_VERSION} \
   /usr/local/bin/etcd --name my-name \
   --initial-advertise-peer-urls http://localhost:2380 --listen-peer-urls http://localhost:2380 \
   --advertise-client-urls http://localhost:2379 --listen-client-urls http://localhost:2379 \

diff --git a/content/en/docs/v3.5/op-guide/container.md b/content/en/docs/v3.5/op-guide/container.md
@@ -24,9 +24,11 @@ docker volume create --name etcd-data
 export DATA_DIR="etcd-data"
 ```
 
-Run the latest version of etcd:
+Run the latest version of etcd (`{{< param git_version_tag >}}` at the time of
+writing):
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=gcr.io/etcd-development/etcd
@@ -35,7 +37,7 @@ docker run \
   -p 2379:2379 \
   -p 2380:2380 \
   --volume=${DATA_DIR}:/etcd-data \
-  --name etcd ${REGISTRY}:latest \
+  --name etcd ${REGISTRY}:${ETCD_VERSION} \
   /usr/local/bin/etcd \
   --data-dir=/etcd-data --name node1 \
   --initial-advertise-peer-urls http://${NODE1}:2380 --listen-peer-urls http://0.0.0.0:2380 \
@@ -57,7 +59,7 @@ REGISTRY=quay.io/coreos/etcd
 REGISTRY=gcr.io/etcd-development/etcd
 
 # For each machine
-ETCD_VERSION=latest
+ETCD_VERSION={{< param git_version_tag >}}
 TOKEN=my-etcd-token
 CLUSTER_STATE=new
 NAME_1=etcd-node-0
@@ -130,6 +132,7 @@ To provision a 3 node etcd cluster on bare-metal, the examples in the [baremetal
 The etcd release container does not include default root certificates. To use HTTPS with certificates trusted by a root authority (e.g., for discovery), mount a certificate directory into the etcd container:
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=docker://gcr.io/etcd-development/etcd
@@ -138,13 +141,14 @@ rkt run \
   --insecure-options=image \
   --volume etcd-ssl-certs-bundle,kind=host,source=/etc/ssl/certs/ca-certificates.crt \
   --mount volume=etcd-ssl-certs-bundle,target=/etc/ssl/certs/ca-certificates.crt \
-  ${REGISTRY}:latest -- --name my-name \
+  ${REGISTRY}:${ETCD_VERSION} -- --name my-name \
   --initial-advertise-peer-urls http://localhost:2380 --listen-peer-urls http://localhost:2380 \
   --advertise-client-urls http://localhost:2379 --listen-client-urls http://localhost:2379 \
   --discovery https://discovery.etcd.io/c11fbcdc16972e45253491a24fcf45e1
 ```
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=gcr.io/etcd-development/etcd
@@ -153,7 +157,7 @@ docker run \
   -p 2379:2379 \
   -p 2380:2380 \
   --volume=/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \
-  ${REGISTRY}:latest \
+  ${REGISTRY}:${ETCD_VERSION} \
   /usr/local/bin/etcd --name my-name \
   --initial-advertise-peer-urls http://localhost:2380 --listen-peer-urls http://localhost:2380 \
   --advertise-client-urls http://localhost:2379 --listen-client-urls http://localhost:2379 \

diff --git a/content/en/docs/v3.5/op-guide/kubernetes.md b/content/en/docs/v3.5/op-guide/kubernetes.md
@@ -159,7 +159,7 @@ spec:
       containers:
       ## This example only has this etcd container.
       - name: etcd
-        image: quay.io/coreos/etcd:v3.5.15
+        image: quay.io/coreos/etcd:{{< param git_version_tag >}}
         imagePullPolicy: IfNotPresent
         ports:
         - name: etcd-client

diff --git a/content/en/docs/v3.6/op-guide/container.md b/content/en/docs/v3.6/op-guide/container.md
@@ -24,9 +24,11 @@ docker volume create --name etcd-data
 export DATA_DIR="etcd-data"
 ```
 
-Run the latest version of etcd:
+Run the latest version of etcd (`{{< param git_version_tag >}}` at the time of
+writing):
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=gcr.io/etcd-development/etcd
@@ -35,7 +37,7 @@ docker run \
   -p 2379:2379 \
   -p 2380:2380 \
   --volume=${DATA_DIR}:/etcd-data \
-  --name etcd ${REGISTRY}:latest \
+  --name etcd ${REGISTRY}:${ETCD_VERSION} \
   /usr/local/bin/etcd \
   --data-dir=/etcd-data --name node1 \
   --initial-advertise-peer-urls http://${NODE1}:2380 --listen-peer-urls http://0.0.0.0:2380 \
@@ -57,7 +59,7 @@ REGISTRY=quay.io/coreos/etcd
 REGISTRY=gcr.io/etcd-development/etcd
 
 # For each machine
-ETCD_VERSION=latest
+ETCD_VERSION={{< param git_version_tag >}}
 TOKEN=my-etcd-token
 CLUSTER_STATE=new
 NAME_1=etcd-node-0
@@ -130,6 +132,7 @@ To provision a 3 node etcd cluster on bare-metal, the examples in the [baremetal
 The etcd release container does not include default root certificates. To use HTTPS with certificates trusted by a root authority (e.g., for discovery), mount a certificate directory into the etcd container:
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=docker://gcr.io/etcd-development/etcd
@@ -138,13 +141,14 @@ rkt run \
   --insecure-options=image \
   --volume etcd-ssl-certs-bundle,kind=host,source=/etc/ssl/certs/ca-certificates.crt \
   --mount volume=etcd-ssl-certs-bundle,target=/etc/ssl/certs/ca-certificates.crt \
-  ${REGISTRY}:latest -- --name my-name \
+  ${REGISTRY}:${ETCD_VERSION} -- --name my-name \
   --initial-advertise-peer-urls http://localhost:2380 --listen-peer-urls http://localhost:2380 \
   --advertise-client-urls http://localhost:2379 --listen-client-urls http://localhost:2379 \
   --discovery https://discovery.etcd.io/c11fbcdc16972e45253491a24fcf45e1
 ```
 
 ```
+ETCD_VERSION={{< param git_version_tag >}}
 REGISTRY=quay.io/coreos/etcd
 # available from v3.2.5
 REGISTRY=gcr.io/etcd-development/etcd
@@ -153,7 +157,7 @@ docker run \
   -p 2379:2379 \
   -p 2380:2380 \
   --volume=/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \
-  ${REGISTRY}:latest \
+  ${REGISTRY}:${ETCD_VERSION} \
   /usr/local/bin/etcd --name my-name \
   --initial-advertise-peer-urls http://localhost:2380 --listen-peer-urls http://localhost:2380 \
   --advertise-client-urls http://localhost:2379 --listen-client-urls http://localhost:2379 \

diff --git a/content/en/docs/v3.6/op-guide/kubernetes.md b/content/en/docs/v3.6/op-guide/kubernetes.md
@@ -159,7 +159,7 @@ spec:
       containers:
       ## This example only has this etcd container.
       - name: etcd
-        image: quay.io/coreos/etcd:v3.5.15
+        image: quay.io/coreos/etcd:{{< param git_version_tag >}}
         imagePullPolicy: IfNotPresent
         ports:
         - name: etcd-client