Merge remote-tracking branch 'upstream/master' into Garbage-collectio…

…n-dry-run-fluxcd#1990

.circleci/config.yml

@@ -1,27 +1,41 @@
 version: 2
 jobs:
   build:
-    working_directory: /go/src/github.com/weaveworks/flux
-    docker:
-      - image: circleci/golang:1.10
-      - image: memcached
+    working_directory: ~/go/src/github.com/weaveworks/flux
+    machine: true
+    environment:
+      GO_VERSION: 1.12.5
+      GOPATH: /home/circleci/go
+      PATH: /bin:/usr/bin:/usr/local/go/bin:/home/circleci/go/bin
     steps:
       - checkout
-      - setup_remote_docker
-
       - run:
-          # Ensure latest version of git
+          name: Install Golang
           command: |
-            echo "deb http://deb.debian.org/debian stretch-backports main" | sudo tee -a /etc/apt/sources.list.d/stretch-backports.list
+            curl -OL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz
+            tar -xf go${GO_VERSION}.linux-amd64.tar.gz
+            sudo rm -rf /usr/local/go
+            sudo mv go /usr/local
+            mkdir -p "$HOME/go/bin"
+            go version
+      - run:
+          name: Update packages and Start Memcached
+          command: |
+            # These repos fail and we don't need them:
+            sudo rm /etc/apt/sources.list.d/circleci_trusty.list /etc/apt/sources.list.d/google-chrome.list
             sudo apt-get update
-            sudo apt-get install -t stretch-backports -y --only-upgrade git
+            sudo apt-get install -y git rng-tools docker-ce memcached
             git version
-      - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            docker version
+      - run: 
+          name: Install Dep
+          command: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
       - run: dep ensure -vendor-only
       - run: make check-generated
       - run: make test TEST_FLAGS="-race -tags integration -timeout 60s"
       - run: make all
-
+      - run: make e2e
+
       - deploy:
           name: Maybe push prerelease images
           command: |
@@ -34,7 +48,6 @@ jobs:
               docker tag "docker.io/weaveworks/helm-operator:$(docker/image-tag)" "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
               docker push "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
             fi
-
       - deploy:
           name: Maybe push release image and upload binaries
           command: |
@@ -50,17 +63,6 @@ jobs:
               RELEASE_TAG=$(echo "$CIRCLE_TAG" | cut -c 6-)
               docker push "docker.io/weaveworks/helm-operator:${RELEASE_TAG}"
             fi
-  e2e-testing:
-    machine: true
-    working_directory: ~/go/src/github.com/weaveworks/flux
-    steps:
-      - checkout
-      - run: test/e2e/e2e-golang.sh
-      - run: test/e2e/e2e-flux-build.sh
-      - run: test/e2e/e2e-kind.sh
-      - run: test/e2e/e2e-helm.sh
-      - run: test/e2e/e2e-git.sh
-      - run: test/e2e/e2e-flux-chart.sh
 
 workflows:
   version: 2
@@ -70,6 +72,4 @@ workflows:
           filters:
             tags:
               only: /(helm-)?[0-9]+(\.[0-9]+)*(-[a-z]+)?/
-      - e2e-testing:
-          requires:
-            - build
+

.gitignore

@@ -40,3 +40,4 @@ docker/fluxy-dumbconf.priv
 test/profiles
 test/bin/kubectl
 test/bin/helm
+test/bin/kind

CHANGELOG.md

@@ -1,6 +1,46 @@
 This is the changelog for the Flux daemon; the changelog for the Helm
 operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md).
 
+## 1.12.3 (2019-05-22)
+
+This is a patch release.
+
+### Fixes
+
+- Show tag image for workload in list-images
+  [weaveworks/flux#2024][]
+- Log warning when not applying resource by namespace
+  [weaveworks/flux#2034][]
+- Always list the status of a workload in `fluxctl`
+  [weaveworks/flux#2035][]
+- Ensure Flux installs gnutls >=3.6.7, to resolve security scan issues
+  [weaveworks/flux#2044][]
+- Rename controller to workload in `fluxctl release`
+  [weaveworks/flux#2048][]
+- Give full output of git command on errors
+  [weaveworks/flux#2054][]
+
+### Maintenance and documentation
+
+- Warn about Flux only supporting YAML and not JSON
+  [weaveworks/flux#2010][]
+- Fix and refactor end-to-end tests
+  [weaveworks/flux#2050][] [weaveworks/flux#2058][]
+
+### Thanks
+
+Thanks to @2opremio, @hiddeco, @squaremo and @xtellurian for contributions.
+
+[weaveworks/flux#2010]: https://github.com/weaveworks/flux/pull/2010
+[weaveworks/flux#2024]: https://github.com/weaveworks/flux/pull/2024
+[weaveworks/flux#2034]: https://github.com/weaveworks/flux/pull/2034
+[weaveworks/flux#2035]: https://github.com/weaveworks/flux/pull/2035
+[weaveworks/flux#2044]: https://github.com/weaveworks/flux/pull/2044
+[weaveworks/flux#2048]: https://github.com/weaveworks/flux/pull/2048
+[weaveworks/flux#2050]: https://github.com/weaveworks/flux/pull/2050
+[weaveworks/flux#2054]: https://github.com/weaveworks/flux/pull/2054
+[weaveworks/flux#2058]: https://github.com/weaveworks/flux/pull/2058
+
 ## 1.12.2 (2019-05-08)
 
 This is a patch release.

Makefile

@@ -47,14 +47,17 @@ release-bins:
 clean:
 	go clean
 	rm -rf ./build
-	rm -f test/bin/kubectl test/bin/helm
+	rm -f test/bin/kubectl test/bin/helm test/bin/kind
 
 realclean: clean
 	rm -rf ./cache
 
 test: test/bin/helm test/bin/kubectl
 	PATH="${PWD}/bin:${PWD}/test/bin:${PATH}" go test ${TEST_FLAGS} $(shell go list ./... | grep -v "^github.com/weaveworks/flux/vendor" | sort -u)
 
+e2e: test/bin/helm test/bin/kubectl build/.flux.done build/.helm-operator.done
+	PATH="${PWD}/test/bin:${PATH}" CURRENT_OS_ARCH=$(CURRENT_OS_ARCH) test/e2e/run.sh
+
 build/.%.done: docker/Dockerfile.%
 	mkdir -p ./build/docker/$*
 	cp $^ ./build/docker/$*/

deploy/flux-deployment.yaml

@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/flux:1.12.2
+        image: docker.io/weaveworks/flux:1.12.3
         imagePullPolicy: IfNotPresent
         resources:
           requests:

gpg/gpgtest/gpg.go

@@ -39,7 +39,7 @@ func GPGKey(t *testing.T) (string, string, func()) {
 		t.Fatal(err)
 	}
 
-	gpgCmd := exec.Command("gpg", "--homedir", newDir, "--list-keys", "--with-colons")
+	gpgCmd := exec.Command("gpg", "--homedir", newDir, "--list-keys", "--with-colons", "--with-fingerprint")
 	grepCmd := exec.Command("grep", "^fpr")
 	cutCmd := exec.Command("cut", "-d:", "-f10")