diff --git a/example/controller.nomad.hcl b/example/controller.nomad.hcl index c16ebb7..2f397db 100644 --- a/example/controller.nomad.hcl +++ b/example/controller.nomad.hcl @@ -33,6 +33,8 @@ job "democratic-csi-controller" { NODE_EXTRA_CA_CERTS = "/local/ca.crt" } + + # Use a template block instead of env {} so we can fetch values from vault template { data = <<_EOT @@ -52,7 +54,7 @@ _EOT } config { - image = "danielberteaud/democratic-csi:1.8.4-1" + image = "danielberteaud/democratic-csi:1.9.0-1" args = [ "--csi-version=1.5.0", @@ -165,6 +167,8 @@ _EOF NODE_EXTRA_CA_CERTS = "/local/ca.crt" } + + # Use a template block instead of env {} so we can fetch values from vault template { data = <<_EOT @@ -184,7 +188,7 @@ _EOT } config { - image = "danielberteaud/democratic-csi:1.8.4-1" + image = "danielberteaud/democratic-csi:1.9.0-1" args = [ "--csi-version=1.5.0", diff --git a/example/images/democratic-csi/Dockerfile b/example/images/democratic-csi/Dockerfile index f15c8eb..35a0904 100644 --- a/example/images/democratic-csi/Dockerfile +++ b/example/images/democratic-csi/Dockerfile @@ -1,4 +1,4 @@ -ARG CSI_VERSION=1.8.4 +ARG CSI_VERSION=1.9.0 FROM docker.io/democraticcsi/democratic-csi:v${CSI_VERSION} MAINTAINER Daniel Berteaud diff --git a/example/node.nomad.hcl b/example/node.nomad.hcl index e84ca70..3aa6344 100644 --- a/example/node.nomad.hcl +++ b/example/node.nomad.hcl @@ -30,7 +30,7 @@ job "democratic-csi-node" { driver = "docker" config { - image = "danielberteaud/democratic-csi:1.8.4-1" + image = "danielberteaud/democratic-csi:1.9.0-1" args = [ "--csi-version=1.5.0", @@ -54,6 +54,8 @@ job "democratic-csi-node" { CSI_NODE_ID = "${attr.unique.hostname}" } + + # Use a template block instead of env {} so we can fetch values from vault template { data = <<_EOT @@ -118,7 +120,7 @@ _EOF driver = "docker" config { - image = "danielberteaud/democratic-csi:1.8.4-1" + image = "danielberteaud/democratic-csi:1.9.0-1" args = [ "--csi-version=1.5.0", @@ -142,6 +144,8 @@ _EOF CSI_NODE_ID = "${attr.unique.hostname}" } + + # Use a template block instead of env {} so we can fetch values from vault template { data = <<_EOT diff --git a/images/democratic-csi/Dockerfile b/images/democratic-csi/Dockerfile index 3ec427b..71ab2f1 100644 --- a/images/democratic-csi/Dockerfile +++ b/images/democratic-csi/Dockerfile @@ -1,4 +1,4 @@ -ARG CSI_VERSION=1.8.4 +ARG CSI_VERSION=[[ .democratic_csi.version ]] FROM docker.io/democraticcsi/democratic-csi:v${CSI_VERSION} MAINTAINER [[ .docker.maintainer ]] diff --git a/variables.yml b/variables.yml index d199c39..bdbcf4c 100644 --- a/variables.yml +++ b/variables.yml @@ -6,7 +6,7 @@ instance: democratic-csi democratic_csi: # Version to deplou - version: 1.8.4 + version: 1.9.0 # The Docker image to use image: '[[ .docker.repo ]]democratic-csi:[[ .democratic_csi.version ]]-1'