Merge pull request #13044 from hashicorp/b-fixup-init-redis

cli: update default redis and use nomad service discovery

.changelog/13044.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: update default redis and use nomad service discovery
+```

api/jobs_test.go

@@ -576,7 +576,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 								Name:   "redis",
 								Driver: "docker",
 								Config: map[string]interface{}{
-									"image": "redis:3.2",
+									"image": "redis:7",
 									"port_map": []map[string]int{{
 										"db": 6379,
 									}},
@@ -708,7 +708,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 								Name:   "redis",
 								Driver: "docker",
 								Config: map[string]interface{}{
-									"image": "redis:3.2",
+									"image": "redis:7",
 									"port_map": []map[string]int{{
 										"db": 6379,
 									}},

client/allocrunner/taskrunner/task_runner_test.go

@@ -681,7 +681,7 @@ func TestTaskRunner_TaskEnv_Image(t *testing.T) {
 	task := alloc.Job.TaskGroups[0].Tasks[0]
 	task.Driver = "docker"
 	task.Config = map[string]interface{}{
-		"image":        "redis:3.2-alpine",
+		"image":        "redis:7-alpine",
 		"network_mode": "none",
 		"command":      "sh",
 		"args": []string{"-c", "echo $NOMAD_ALLOC_DIR; " +

command/assets/example-short.nomad

@@ -12,7 +12,7 @@ job "example" {
       driver = "docker"
 
       config {
-        image          = "redis:3.2"
+        image          = "redis:7"
         ports          = ["db"]
         auth_soft_fail = true
       }

command/assets/example.nomad

@@ -157,8 +157,8 @@ job "example" {
     }
 
     # The "service" stanza instructs Nomad to register this task as a service
-    # in the service discovery engine, which is currently Consul. This will
-    # make the service addressable after Nomad has placed it on a host and
+    # in the service discovery engine, which is currently Nomad or Consul. This
+    # will make the service discoverable after Nomad has placed it on a host and
     # port.
     #
     # For more information and examples on the "service" stanza, please see
@@ -167,9 +167,10 @@ job "example" {
     #     https://www.nomadproject.io/docs/job-specification/service
     #
     service {
-      name = "redis-cache"
-      tags = ["global", "cache"]
-      port = "db"
+      name     = "redis-cache"
+      tags     = ["global", "cache"]
+      port     = "db"
+      provider = "nomad"
 
       # The "check" stanza instructs Nomad to create a Consul health check for
       # this service. A sample check is provided here for your convenience;
@@ -302,7 +303,7 @@ job "example" {
       # are specific to each driver, so please see specific driver
       # documentation for more information.
       config {
-        image = "redis:3.2"
+        image = "redis:7"
         ports = ["db"]
 
         # The "auth_soft_fail" configuration instructs Nomad to try public

command/testdata/example-short-bad.json

@@ -23,7 +23,7 @@
                         "Lifecycle": null,
                         "Config": {
                             "auth_soft_fail": true,
-                            "image": "redis:3.2",
+                            "image": "redis:7",
                             "ports": [
                                 "db"
                             ]

command/testdata/example-short.json

@@ -26,7 +26,7 @@
                         "Lifecycle": null,
                         "Config": {
                             "auth_soft_fail": true,
-                            "image": "redis:3.2",
+                            "image": "redis:7",
                             "ports": [
                                 "db"
                             ]

demo/csi/digitalocean/volume-job.nomad

@@ -13,7 +13,7 @@ job "example" {
       driver = "docker"
 
       config {
-        image = "redis:3.2"
+        image = "redis:7"
 
         port_map {
           db = 6379

demo/csi/hostpath/redis.nomad

@@ -24,7 +24,7 @@ job "example" {
       driver = "docker"
 
       config {
-        image = "redis:3.2"
+        image = "redis:7"
         ports = ["db"]
       }
 

drivers/docker/config_test.go

@@ -21,10 +21,10 @@ func TestConfig_ParseHCL(t *testing.T) {
 		{
 			"basic image",
 			`config {
-				image = "redis:3.2"
+				image = "redis:7"
 			}`,
 			&TaskConfig{
-				Image:            "redis:3.2",
+				Image:            "redis:7",
 				Devices:          []DockerDevice{},
 				Mounts:           []DockerMount{},
 				MountsList:       []DockerMount{},
@@ -196,7 +196,7 @@ func TestConfig_ParseAllHCL(t *testing.T) {
 
 	cfgStr := `
 config {
-  image = "redis:3.2"
+  image = "redis:7"
   image_pull_timeout = "15m"
   advertise_ipv6_address = true
   args = ["command_arg1", "command_arg2"]
@@ -342,7 +342,7 @@ config {
 }`
 
 	expected := &TaskConfig{
-		Image:             "redis:3.2",
+		Image:             "redis:7",
 		ImagePullTimeout:  "15m",
 		AdvertiseIPv6Addr: true,
 		Args:              []string{"command_arg1", "command_arg2"},

drivers/docker/driver_test.go

@@ -2292,7 +2292,7 @@ func TestDockerDriver_AuthConfiguration(t *testing.T) {
 			AuthConfig: nil,
 		},
 		{
-			Repo: "redis:3.2",
+			Repo: "redis:7",
 			AuthConfig: &docker.AuthConfiguration{
 				Username:      "test",
 				Password:      "1234",
@@ -2301,7 +2301,7 @@ func TestDockerDriver_AuthConfiguration(t *testing.T) {
 			},
 		},
 		{
-			Repo: "quay.io/redis:3.2",
+			Repo: "quay.io/redis:7",
 			AuthConfig: &docker.AuthConfiguration{
 				Username:      "test",
 				Password:      "5678",
@@ -2310,7 +2310,7 @@ func TestDockerDriver_AuthConfiguration(t *testing.T) {
 			},
 		},
 		{
-			Repo: "other.io/redis:3.2",
+			Repo: "other.io/redis:7",
 			AuthConfig: &docker.AuthConfiguration{
 				Username:      "test",
 				Password:      "abcd",

drivers/docker/test-resources/docker/reconciler_containers_list.json

@@ -4,7 +4,7 @@
     "Names": [
       "/redis-72bfa388-024e-a903-45b8-2bc28b74ed69"
     ],
-    "Image": "redis:3.2",
+    "Image": "redis:7",
     "ImageID": "sha256:87856cc39862cec77541d68382e4867d7ccb29a85a17221446c857ddaebca916",
     "Command": "docker-entrypoint.sh redis-server",
     "Created": 1568383081,