From 302aeef536025a4d6908ce840b8a59492ca5c56a Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Tue, 18 Sep 2018 11:26:31 +0100 Subject: [PATCH 1/4] Merge pull request #1369 from alanjcastonguay/patch-1 Reduce memcache logging by default --- deploy/memcache-dep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/memcache-dep.yaml b/deploy/memcache-dep.yaml index b8dc3f490..0a8a0d17f 100644 --- a/deploy/memcache-dep.yaml +++ b/deploy/memcache-dep.yaml @@ -22,7 +22,7 @@ spec: args: - -m 64 # Maximum memory to use, in megabytes. 64MB is default. - -p 11211 # Default port, but being explicit is nice. - - -vv # This gets us to the level of request logs. + # - -vv # Uncomment to get logs of each request and response. ports: - name: clients containerPort: 11211 From 136c5f9c1c8ce2101cf5097a1f6326038a5efce5 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Wed, 19 Sep 2018 10:48:02 +0100 Subject: [PATCH 2/4] Merge pull request #1372 from weaveworks/issue/1371-podcontroller-encapsulation Include initContainers in images to fetch --- cluster/kubernetes/images.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cluster/kubernetes/images.go b/cluster/kubernetes/images.go index 4f39f3412..b0436c419 100644 --- a/cluster/kubernetes/images.go +++ b/cluster/kubernetes/images.go @@ -89,6 +89,14 @@ func mergeCredentials(log func(...interface{}) error, client extendedClient, nam } imageCreds[r.Name] = creds } + for _, container := range podTemplate.Spec.InitContainers { + r, err := image.ParseRef(container.Image) + if err != nil { + log("err", err.Error()) + continue + } + imageCreds[r.Name] = creds + } } // ImagesToFetch is a k8s specific method to get a list of images to update along with their credentials From 984c20d1db15a5b458111a7da82e47664c484c17 Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Mon, 24 Sep 2018 12:40:42 +0200 Subject: [PATCH 3/4] Merge pull request #1389 from dholbach/fix-827 Remove the suggestion to use "fluxctl status". --- http/errors.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/http/errors.go b/http/errors.go index 758c21619..64c475270 100644 --- a/http/errors.go +++ b/http/errors.go @@ -18,9 +18,7 @@ If you still have this problem after upgrading, please file an issue at https://github.com/weaveworks/flux/issues -mentioning what you were attempting to do, and the output of - - fluxctl status +mentioning what you were attempting to do. `, Err: errors.New("API endpoint deprecated"), } @@ -54,11 +52,7 @@ If you still have problems, please file an issue at https://github.com/weaveworks/flux/issues -mentioning what you were attempting to do, and the output of - - fluxctl status - -and include this path: +mentioning what you were attempting to do, and include this path: ` + path + ` `, From 5b6530dfe13fb651e3e8689c010370f8e3dff997 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Wed, 26 Sep 2018 15:52:23 +0100 Subject: [PATCH 4/4] Update changelog for v1.7.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505d0813a..50c03d9b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,26 @@ This is the changelog for the Flux daemon; the changelog for the Helm operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md). +## 1.7.1 (2018-09-26) + +This is a patch release, mainly to include the fix for initContainer +images (#1372). + +### Fixes + +- Include initContainers when scanning for images to fetch metadata + for, e..g, so there will be "available image" rows for the + initContainer in `fluxctl list-images` + [weaveworks/flux#1372](https://github.com/weaveworks/flux/pull/1372) +- Turn memcached's logging verbosity down, in the example deployment + YAMLs [weaveworks/flux#1369](https://github.com/weaveworks/flux/pull/1369) +- Remove mention of an archaic `fluxctl` command from help text + [weaveworks/flux#1389](https://github.com/weaveworks/flux/pull/1389) + +### Thanks + +Thanks for fixes go to @alanjcastonguay, @dholbach, and @squaremo. + ## 1.7.0 (2018-09-17) This release has a soupçon of bug fixes. It gets a minor version bump,