Merge branch 'main' into issue-1040/warn-on-mismatched-nomad-versions

.changelog/10563.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Handle ACL token when running behind a reverse proxy
+```

.changelog/10666.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Add ability to search across all namespaces
+```

.changelog/10675.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Added new screen to dispatch a parameterized batch job
+```

.changelog/10804.txt

@@ -0,0 +1,4 @@
+```release-note:improvement
+consul/connect: automatically set CONSUL_TLS_SERVER_NAME for connect native tasks
+```
+

.changelog/10806.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+dispatch jobs: Added optional idempotency token to `WriteOptions` which prevents Nomad from creating new dispatched jobs for retried requests.
+```

.changelog/10818.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+csi: fixed a CLI panic when formatting `volume status` with `-verbose` flag
+```

.changelog/10822.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed system commands, so they correctly use passed flags
+```

.changelog/10823.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+driver/docker: Moved the generated `/etc/hosts` file's mount source to the allocation directory so that it can be shared between tasks of an allocation.
+```

.changelog/10840.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+csi: Fixed a bug where volume secrets were not used for creating snapshots.
+```

.changelog/10842.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+consul: remove ineffective edge case handling on service deregistration
+```

.changelog/10848.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+csi: add flag for providing secrets as a set of key/value pairs to list snapshots
+```

.changelog/10849.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+drivers: Fixed bug where Nomad incorrectly reported tasks as recovered successfully even when they were not.
+```

.changelog/10855.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+volumes: Fix a bug where the HTTP server would crash if a `volume_mount` block was empty
+```

.changelog/10859.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: Added a `-task` flag to `alloc restart` and `alloc signal` for consistent UX with `alloc exec` and `alloc logs`
+```

.changelog/10861.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+api: Added `NewSystemJob` helper function to create base system job object.
+```

.changelog/10864.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+scheduler: Fixed a bug where updates to the `datacenters` field were not destructive.
+```

.changelog/10865.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+consul: avoid extra sync operations when no action required
+```

.changelog/10868.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+consul: Fixed a bug where services may incorrectly fail conflicting name validation
+```

.changelog/10870.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cni: Fixed a bug where fingerprinting of CNI configuration failed with default `cni_config_dir` and `cni_path`
+```

.changelog/10872.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+consul/connect: Avoid assumption of parent service when syncing connect proxies
+```

.changelog/10873.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+consul/connect: Fixed a bug where service deregistered before connect sidecar
+```

.changelog/10875.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed a bug where `-namespace` flag was not respected for `job run` and `job plan` commands.
+```

.changelog/10876.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+client: Fixed bug where meta blocks were not interpolated with task environment
+```

.changelog/10883.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+consul/connect: Fixed a bug causing high CPU with multiple connect sidecars in one group
+```

.changelog/10892.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+deps: Update `hashicorp/consul-template` to v0.25.2 to fix panic reading Vault secrets
+```

.changelog/10893.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fixes bug where UI was not detecting namespace-specific capabilities.
+```

.changelog/10896.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fixed a bug where internalized constraint strings broke job plan
+```

.changelog/10897.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fixed a bug where affinity memoization may cause planning problems
+```

.changelog/10898.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+build: no longer use vendor directory
+```

.changelog/10907.txt

@@ -0,0 +1,4 @@
+```release-note:bug
+client: Fixed a bug where a restarted client may start an already completed tasks in rare conditions
+```
+

.changelog/10916.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+audit (Enterprise): allow configuring file mode for audit logs
+```

.changelog/10917.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed the help message for the `nomad alloc signal` command
+```

.changelog/10926.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed a panic when deployment monitor is invoked in some CI environments
+```

.changelog/10929.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+driver/docker: Fixed a bug in the authentication config where not all fields were set
+```

.changelog/10931.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: Support recent job spec construct in the HCLv1 parser
+```

.changelog/10934.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fixed a bug where the job dispatch form is not displayed when the job doesn't have meta fields
+```

.changelog/10951.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+consul/connect: Reduced the noise of log messages emitted for connect native tasks
+```

.changelog/10952.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fixed a panic that may arise when upgrading pre-1.1.0 cluster to 1.1.x and may cause cluster outage
+```

.changelog/10958.txt

@@ -0,0 +1,4 @@
+
+```release-note:bug
+api: Reverted to using http/1 to fix a 1.1.2 regression in `alloc exec` sessions
+```

.changelog/10990.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+server: Fixed a bug where planning job update reports spurious in-place updates even if the update includes no changes
+```

.changelog/11005.txt

@@ -0,0 +1,4 @@
+
+```release-note:improvement
+client: Speed up client startup time
+```

.changelog/11007.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+scheduler: Re-evaluate nodes for system jobs after attributes changes
+```

.changelog/11013.txt

@@ -0,0 +1,4 @@
+
+```release-note:bug
+deployments: Fixed a bug where multi-group deployments don't get auto-promoted when one group has no canaries.
+```

.changelog/11019.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fixed a bug where the "Dispatch Job" button was displayed for non-parameterized jobs
+```

.changelog/11020.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Add header separator between a child job priority and its parent
+```

.changelog/11054.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fixed a bug where system jobs with non-unique IDs may not be placed on new nodes
+```

.changelog/11065.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+deps: Updated `x/sys` to `20210818153620-00dd8d7831e7`
+```

.changelog/11070.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+agent: Don't timestamp active log file.
+```

.changelog/11083.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+build: Updated to Go 1.16.7
+```

.changelog/changelog.tmpl

@@ -0,0 +1,56 @@
+{{- if .NotesByType.feature }}
+FEATURES:
+
+{{range .NotesByType.feature -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if index .NotesByType "breaking-change" -}}
+BREAKING CHANGES:
+
+{{range index .NotesByType "breaking-change" -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.security }}
+SECURITY:
+
+{{range .NotesByType.security -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.improvement }}
+IMPROVEMENTS:
+
+{{range .NotesByType.improvement -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.deprecation }}
+DEPRECATIONS:
+
+{{range .NotesByType.deprecation -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.bug }}
+BUG FIXES:
+
+{{range .NotesByType.bug -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.note }}
+NOTES:
+
+{{range .NotesByType.note -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+

.changelog/note.tmpl

@@ -0,0 +1,3 @@
+{{- define "note" -}}
+{{.Body}}{{if not (stringHasPrefix .Issue "_")}} [[GH-{{- .Issue -}}](https://github.com/hashicorp/nomad/issues/{{- .Issue -}})]{{end}}
+{{- end -}}

.circleci/Makefile

@@ -14,67 +14,24 @@ ifeq ($(CCI_VERSION),)
 CIRCLECI := echo '$(CCI_INSTALL_MSG)'; exit 1; \#
 endif
 
-SOURCE_DIR     := config
-SOURCE_YML     := $(shell [ ! -d $(SOURCE_DIR) ] || find $(SOURCE_DIR) -name '*.yml')
-CONFIG_SOURCE  := Makefile $(SOURCE_YML) | $(SOURCE_DIR)
-OUT            := config.yml
-TMP            := .tmp/config-processed
-CONFIG_PACKED  := .tmp/config-packed
-
 default: help
 
 help:
 	@echo "Usage:"
-	@echo "  make ci-config: recompile config.yml from $(SOURCE_DIR)/"
-	@echo "  make ci-verify: verify that config.yml is a true mapping from $(SOURCE_DIR)/"
+	@echo "  make ci-verify: validate that config.yml for correctness"
 	@echo
 	@echo "Diagnostics:"
 	@[ -z "$(CCI_VERSION)" ] || echo "  circleci-cli version $(CCI_VERSION)"
 	@[ -n "$(CCI_VERSION)" ] || echo "  $(CCI_INSTALL_MSG)"
 
-$(SOURCE_DIR):
-	@echo No source directory $(SOURCE_DIR) found.; exit 1
-
-# Make sure our .tmp dir exists.
-$(shell [ -d .tmp ] || mkdir .tmp)
-
-.PHONY: ci-config
-ci-config: $(OUT)
-
 .PHONY: ci-verify
-ci-verify: config-up-to-date
-	@$(CIRCLECI) config validate $(OUT)
+ci-verify:
+	@$(CIRCLECI) config validate config.yml
 
-define GENERATED_FILE_HEADER
-### ***
-### WARNING: DO NOT manually EDIT or MERGE this file, it is generated by 'make ci-config'.
-### INSTEAD: Edit or merge the source in $(SOURCE_DIR)/ then run 'make ci-config'.
-### ***
-endef
-export GENERATED_FILE_HEADER
+MKFILE_PATH := $(lastword $(filter %Makefile,$(MAKEFILE_LIST)))
+CURRENT_DIR := $(dir $(realpath $(MKFILE_PATH)))
+CURRENT_DIR := $(CURRENT_DIR:/=)
 
-# GEN_CONFIG writes the config to a temporary file. If the whole process succeeds,
-# it then moves that file to $@. This makes is an atomic operation, so if it fails
-# make doesn't consider a half-baked file up to date.
-define GEN_CONFIG
-	@$(CIRCLECI) config pack $(SOURCE_DIR) > $(CONFIG_PACKED)
-	@echo "$$GENERATED_FILE_HEADER" > $@.tmp || { rm -f $@; exit 1; }
-	@$(CIRCLECI) config process $(CONFIG_PACKED) >> $@.tmp || { rm -f $@.tmp; exit 1; }
-	@mv -f $@.tmp $@
-endef
-
-$(OUT): $(CONFIG_SOURCE)
-	$(GEN_CONFIG)
-	@echo "$@ updated"
-
-$(TMP): $(CONFIG_SOURCE)
-	$(GEN_CONFIG)
-
-.PHONY: config-up-to-date
-config-up-to-date: $(TMP) # Note this must not depend on $(OUT)!
-	@if diff config.yml $<; then \
-		echo "Generated $(OUT) is up to date!"; \
-	else \
-		echo "Generated $(OUT) is out of date, run make $(CONFIG) to update."; \
-		exit 1; \
-	fi
+ifneq ($(wildcard $(CURRENT_DIR)/*.mk),)
+include $(CURRENT_DIR)/*.mk
+endif