REVERT: replace docker to nerdctl #20

outputs.tf

@@ -2,7 +2,6 @@ output "systemd_units" {
   value = concat([
     data.ignition_systemd_unit.etcd_service.rendered,
     data.ignition_systemd_unit.etcd_data_mount.rendered,
-    data.ignition_systemd_unit.init_nerdctl.rendered,
     ],
     var.enable_metrics_proxy ? [
       data.ignition_systemd_unit.etcd_metrics_proxy_service.rendered
@@ -20,9 +19,7 @@ output "files" {
     data.ignition_file.etcd_server_cert.rendered,
     data.ignition_file.etcd_server_key.rendered,
     data.ignition_file.etcd_peer_cert.rendered,
-    data.ignition_file.etcd_peer_key.rendered,
-    data.ignition_file.init_nerdctl.rendered,
-    data.ignition_file.nerdctl.rendered,
+    data.ignition_file.etcd_peer_key.rendered
     ],
     var.enable_metrics_proxy ? [
       data.ignition_file.etcd_metrics_proxy_wrapper_sh.rendered

scripts/etcd-metrics-proxy-wrapper.sh

@@ -32,9 +32,9 @@ fi
 
 DOCKER_RUN_ARGS="${DOCKER_RUN_ARGS} ${DOCKER_OPTS}"
 
-NERDCTL="${NERDCTL:-/opt/bin/nerdctl}"
+DOCKER="${DOCKER:-/usr/bin/docker}"
 set -x
-exec ${NERDCTL} run \
+exec ${DOCKER} run \
   -v ${ETCD_CERT_PATH}:${ETCD_CERT_PATH}:ro \
   --env-file=/etc/etcd/config.env \
   --net=host \

scripts/etcd-wrapper.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wrapper for launching etcd via nerdctl.
+# Wrapper for launching etcd via docker.
 
 set -e
 
@@ -60,9 +60,9 @@ fi
 
 DOCKER_RUN_ARGS="${DOCKER_RUN_ARGS} ${DOCKER_OPTS}"
 
-NERDCTL="${NERDCTL:-/opt/bin/nerdctl}"
+DOCKER="${DOCKER:-/usr/bin/docker}"
 set -x
-exec ${NERDCTL} run \
+exec ${DOCKER} run \
   -v ${ETCD_DATA_DIR}:${ETCD_DATA_DIR}:rw \
   -v /etc/ssl/certs:/etc/ssl/certs:ro \
   -v ${ETCD_CERT_PATH}:${ETCD_CERT_PATH}:rw \

templates/etcd-metrics-proxy.service.tpl

@@ -1,14 +1,13 @@
 [Unit]
 Description=etcd-metrics-proxy service
-After=init-nerdctl.service
 Requires=network-online.target
 
 [Service]
 Environment="PATH=/opt/bin:/opt/etcd/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
 EnvironmentFile=/etc/etcd/config.env
-ExecStartPre=-/opt/bin/nerdctl rm -f etcd-metrics-proxy
+ExecStartPre=-/usr/bin/docker rm -f etcd-metrics-proxy
 ExecStart=/opt/etcd/bin/etcd-metrics-proxy-wrapper
-ExecStop=-/opt/bin/nerdctl stop etcd-metrics-proxy
+ExecStop=-/usr/bin/docker stop etcd-metrics-proxy
 
 Restart=always
 RestartSec=10

templates/etcd.service.tpl

@@ -1,14 +1,13 @@
 [Unit]
 Description=etcd service
-After=init-nerdctl.service
 Requires=network-online.target
 
 [Service]
 Environment="PATH=/opt/bin:/opt/etcd/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
 EnvironmentFile=/etc/etcd/config.env
-ExecStartPre=-/opt/bin/nerdctl rm -f etcd
+ExecStartPre=-/usr/bin/docker rm -f etcd
 ExecStart=/opt/etcd/bin/etcd-wrapper
-ExecStop=-/opt/bin/nerdctl stop etcd
+ExecStop=-/usr/bin/docker stop etcd
 
 Restart=always
 RestartSec=10

variables.tf

@@ -12,15 +12,6 @@ variable "containers" {
   default = {}
 }
 
-variable "binaries" {
-  description = "Desired addon binaries url and checksum."
-  type = map(object({
-    source   = string
-    checksum = string
-  }))
-  default = {}
-}
-
 variable "cloud_provider" {
   description = "The name of public cloud."
   type        = string

variables_defaults.tf

@@ -13,12 +13,4 @@ locals {
   extra_flags = merge({
     "log-level" = var.log_level
   }, var.extra_flags)
-
-  binaries = merge(
-    {
-      nerdctl = {
-        source   = "https://github.com/containerd/nerdctl/releases/download/v1.6.0/nerdctl-1.6.0-linux-amd64.tar.gz"
-        checksum = "sha512-89dcba32badfd1481d88cd5f4179ff99348578af5004a7e96daa05101e99ba7448685596692ada3186f718ffd1166768ac6a22e041c5887e416e6dc7fda97f24"
-      }
-  }, var.binaries)
 }