From a10f38e15a6b9764c55a0fc5e94e8f180742401e Mon Sep 17 00:00:00 2001 From: Anton Osmond Date: Thu, 22 Aug 2019 11:02:06 +0100 Subject: [PATCH 1/8] Add the ability to disable the memcached deploy And update README.md to be clear that disabling memcached in the chart requires an external memcached service. --- chart/flux/README.md | 2 ++ chart/flux/templates/deployment.yaml | 2 +- chart/flux/templates/memcached.yaml | 2 ++ chart/flux/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/chart/flux/README.md b/chart/flux/README.md index 0e4705b00..12f852d50 100755 --- a/chart/flux/README.md +++ b/chart/flux/README.md @@ -248,6 +248,8 @@ The following tables lists the configurable parameters of the Flux chart and the | `registry.dockercfg.enabled` | `false` | Mount `config.json` via Secret into the Flux Pod, enabling Flux to use a custom docker config file | `registry.dockercfg.secretName` | `None` | Kubernetes secret with the docker config.json | `registry.dockercfg.configFileName` | `/dockercfg/config.json` | Alternative path/name of the docker config.json +| `memcached.enabled` | `true` | Create a memcached deployment and service. When set to `false` you must set an external memcached service. +| `memcached.hostnameOverride` | `None` | Override the hostname to the memcached service. Useful when using memcached deployed separately from this chart. | `memcached.verbose` | `false` | Enable request logging in memcached | `memcached.maxItemSize` | `5m` | Maximum size for one item | `memcached.maxMemory` | `128` | Maximum memory to use, in megabytes diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml index 1acb2bb05..cde415386 100644 --- a/chart/flux/templates/deployment.yaml +++ b/chart/flux/templates/deployment.yaml @@ -168,7 +168,7 @@ spec: {{end}} - --ssh-keygen-dir=/var/fluxd/keygen - --k8s-secret-name={{ .Values.git.secretName | default (printf "%s-git-deploy" (include "flux.fullname" .)) }} - - --memcached-hostname={{ template "flux.fullname" . }}-memcached + - --memcached-hostname={{ .Values.memcached.hostnameOverride | default (printf "%s-memcached" (include "flux.fullname" .)) }} - --sync-state={{ .Values.sync.state }} {{- if .Values.memcached.createClusterIP }} - --memcached-service= diff --git a/chart/flux/templates/memcached.yaml b/chart/flux/templates/memcached.yaml index fa1b98a55..ca0e7de8b 100755 --- a/chart/flux/templates/memcached.yaml +++ b/chart/flux/templates/memcached.yaml @@ -1,3 +1,4 @@ +{{- if .Values.memcached.enabled }} apiVersion: apps/v1 kind: Deployment metadata: @@ -77,3 +78,4 @@ spec: selector: app: {{ template "flux.name" . }}-memcached release: {{ .Release.Name }} +{{- end }} diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml index 088aa3895..7d1333e6b 100644 --- a/chart/flux/values.yaml +++ b/chart/flux/values.yaml @@ -224,6 +224,8 @@ registry: configFileName: /dockercfg/config.json memcached: + enabled: true + hostnameOverride: repository: memcached tag: 1.5.15 pullSecret: From 5fc0efd2ba9d928d113b7fda7ed2b9a5b15c5c50 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Thu, 22 Aug 2019 20:21:36 +0300 Subject: [PATCH 2/8] Release chart v0.14.0 --- chart/flux/CHANGELOG.md | 9 +++++++++ chart/flux/Chart.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/chart/flux/CHANGELOG.md b/chart/flux/CHANGELOG.md index 38e8af6c5..fc3bbde35 100644 --- a/chart/flux/CHANGELOG.md +++ b/chart/flux/CHANGELOG.md @@ -1,3 +1,12 @@ +## 0.14.0 (2019-08-22) + +### Improvements + + - Updated Flux to `1.14.1` + [fluxcd/flux#2401](https://github.com/fluxcd/flux/pull/2401) + - Add the ability to disable memcached and set an external memcached service + [fluxcd/flux#2393](https://github.com/fluxcd/flux/pull/2393) + ## 0.13.0 (2019-08-21) ### Improvements diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml index 3522ec38c..add42ab67 100644 --- a/chart/flux/Chart.yaml +++ b/chart/flux/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 appVersion: "1.14.1" -version: 0.13.0 +version: 0.14.0 kubeVersion: ">=1.9.0-0" name: flux description: Flux is a tool that automatically ensures that the state of a cluster matches what is specified in version control From 58520fd000c91a3cef45cb999e1b43fa1ac8e6a0 Mon Sep 17 00:00:00 2001 From: Michael Frister Date: Thu, 22 Aug 2019 20:21:06 +0200 Subject: [PATCH 3/8] Fix listing helm releases if v1 release exists --- cluster/kubernetes/resourcekinds.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/kubernetes/resourcekinds.go b/cluster/kubernetes/resourcekinds.go index 05e43dafc..8f33c8921 100644 --- a/cluster/kubernetes/resourcekinds.go +++ b/cluster/kubernetes/resourcekinds.go @@ -509,8 +509,8 @@ func (hr *helmReleaseKind) getWorkloads(ctx context.Context, c *Cluster, namespa if err := ctx.Err(); err != nil { return nil, err } - var names map[string]bool - var workloads []workload + names := make(map[string]bool, 0) + workloads := make([]workload, 0) if helmReleases, err := c.client.HelmV1().HelmReleases(namespace).List(meta_v1.ListOptions{}); err == nil { for i, _ := range helmReleases.Items { workload := makeHelmReleaseStableWorkload(&helmReleases.Items[i]) From e444d6e80147a00d26f8c3916fa00432e1236a59 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 28 Aug 2019 14:28:19 +0300 Subject: [PATCH 4/8] Add flag to set klog verbosity --- cmd/fluxd/main.go | 13 ++++++++++++- go.mod | 6 ++++-- go.sum | 20 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go index 4d75d4609..678780ab5 100644 --- a/cmd/fluxd/main.go +++ b/cmd/fluxd/main.go @@ -1,6 +1,7 @@ package main import ( + "flag" "fmt" "io/ioutil" "net/http" @@ -167,6 +168,7 @@ func main() { k8sSecretDataKey = fs.String("k8s-secret-data-key", "identity", "data key holding the private SSH key within the k8s secret") k8sNamespaceWhitelist = fs.StringSlice("k8s-namespace-whitelist", []string{}, "experimental, optional: restrict the view of the cluster to the namespaces listed. All namespaces are included if this is not set") k8sAllowNamespace = fs.StringSlice("k8s-allow-namespace", []string{}, "experimental: restrict all operations to the provided namespaces") + k8sVerbosity = fs.Int("k8s-verbosity", 0, "klog verbosity level") // SSH key generation sshKeyBits = optionalVar(fs, &ssh.KeyBitsValue{}, "ssh-keygen-bits", "-b argument to ssh-keygen (default unspecified)") @@ -201,7 +203,9 @@ func main() { // Explicitly initialize klog to enable stderr logging, // and parse our own flags. - klog.InitFlags(nil) + klogFlags := flag.NewFlagSet("klog", flag.ExitOnError) + klog.InitFlags(klogFlags) + err := fs.Parse(os.Args[1:]) switch { case err == pflag.ErrHelp: @@ -215,6 +219,13 @@ func main() { os.Exit(0) } + // set klog verbosity level + if *k8sVerbosity > 0 { + verbosity := klogFlags.Lookup("v") + verbosity.Value.Set(strconv.Itoa(*k8sVerbosity)) + klog.V(4).Infof("Kubernetes client verbosity level set to %v", klogFlags.Lookup("v").Value) + } + // Logger component. var logger log.Logger { diff --git a/go.mod b/go.mod index d99d68a78..29525f4f2 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/aws/aws-sdk-go v1.19.11 github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 github.com/docker/distribution v0.0.0-00010101000000-000000000000 + github.com/docker/go-metrics v0.0.1 // indirect github.com/evanphx/json-patch v4.1.0+incompatible github.com/fluxcd/helm-operator v1.0.0-rc1 github.com/ghodss/yaml v1.0.0 @@ -19,11 +20,12 @@ require ( github.com/imdario/mergo v0.3.7 github.com/instrumenta/kubeval v0.0.0-20190804145309-805845b47dfc github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/opencontainers/go-digest v1.0.0-rc1 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 // indirect github.com/pkg/errors v0.8.1 github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942 - github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 + github.com/prometheus/client_golang v1.1.0 github.com/ryanuber/go-glob v1.0.0 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd @@ -33,7 +35,7 @@ require ( github.com/weaveworks/common v0.0.0-20190410110702-87611edc252e github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa - golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f + golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 gopkg.in/yaml.v2 v2.2.2 k8s.io/api v0.0.0-20190313235455-40a48860b5ab diff --git a/go.sum b/go.sum index 7df35bae9..de9ef7d58 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,9 @@ github.com/aws/aws-sdk-go v1.19.11 h1:tqaTGER6Byw3QvsjGW0p018U2UOqaJPeJuzoaF7jjo github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA= github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= @@ -44,6 +47,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA= github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= +github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -152,6 +157,7 @@ github.com/instrumenta/kubeval v0.0.0-20190804145309-805845b47dfc/go.mod h1:bpiM github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -185,6 +191,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833/go.mod h1:0CznHmXSjMEqs5Tezj/w2emQoM41wzYM9KpDKUHPYag= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -214,6 +222,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 h1:D+CiwcpGTW6pL6bv6KI3KbyEyCKyS+1JWS2h8PNDnGA= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= @@ -221,10 +232,16 @@ github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1: github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.3.0 h1:taZ4h8Tkxv2kNyoSctBvfXEHmBmxrwmIidZTIaHons4= github.com/prometheus/common v0.3.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190412120340-e22ddced7142 h1:JO6VBMEDSBX/LT4GKwSdvuFigZNwVD4lkPyUE4BDCKE= github.com/prometheus/procfs v0.0.0-20190412120340-e22ddced7142/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -302,6 +319,7 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -329,6 +347,8 @@ golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20180810153555-6e3c4e7365dd/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= From 2e2a6c748fda826792c860ca5bd11feb7debb11b Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Thu, 29 Aug 2019 13:40:25 +0200 Subject: [PATCH 5/8] Fix the resolving of a single v1 HelmRelease Due to a mistake the name of the resource was used as a namespace argument, as a result several functionalities relying on this method did no longer work as it was unable to find the given workload (e.g. automatic image updates and fluxctl workload selector flags). Passing along the namespace (as intended) resolves all this. --- cluster/kubernetes/resourcekinds.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/kubernetes/resourcekinds.go b/cluster/kubernetes/resourcekinds.go index 8f33c8921..3f0d730b3 100644 --- a/cluster/kubernetes/resourcekinds.go +++ b/cluster/kubernetes/resourcekinds.go @@ -488,7 +488,7 @@ func (hr *helmReleaseKind) getWorkload(ctx context.Context, c *Cluster, namespac if err := ctx.Err(); err != nil { return workload{}, err } - if helmRelease, err := c.client.HelmV1().HelmReleases(name).Get(name, meta_v1.GetOptions{}); err == nil { + if helmRelease, err := c.client.HelmV1().HelmReleases(namespace).Get(name, meta_v1.GetOptions{}); err == nil { return makeHelmReleaseStableWorkload(helmRelease), err } helmRelease, err := c.client.FluxV1beta1().HelmReleases(namespace).Get(name, meta_v1.GetOptions{}) From 7eeafd4bac93a6747516478d32c6eb5faa8453e6 Mon Sep 17 00:00:00 2001 From: Ricardo Aravena Date: Thu, 29 Aug 2019 14:50:08 -0700 Subject: [PATCH 6/8] Update README.md Add Rakuten --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c5a081764..f67126989 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ container images and config changes are propagated to the cluster. - [Omise](https://www.omise.co) - [Payout](https://payout.one) - [Qordoba](https://qordoba.com) +- [Rakuten](https://rakuten.com) - [Replicated](https://replicated.com) - [Rungway](https://rungway.com) - [Starbucks](https://www.starbucks.com/) From 9adce009f2a65dba460f980a0bec14d6607401d1 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Mon, 2 Sep 2019 11:52:15 +0100 Subject: [PATCH 7/8] Update changelog for 1.14.2 --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12e4cac94..f61682fc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,39 @@ +## 1.14.2 (2019-09-02) + +This is a patch release, with some important fixes to the handling of +HelmRelease resources. + +### Fixes + +- Correct a problem that prevented automated HelmRelease updates + [fluxcd/flux#2412][] +- Fix a crash triggered when `helm.fluxcd.io/v1` resources are present + in the cluster [fluxcd/flux#2404][] + +### Enhancements + +- Add a flag `--k8s-verbosity`, for controlling Kubernetes client + logging (formerly, this was left disabled) [fluxcd/flux#2410][] + +### Maintenance and documentation + +- Rakuten is now listed as a production user [fluxcd/flux#2413][] + +### Thanks + +Bouquets to @HighwayofLife, @IsNull, @adeleglise, @aliartiza75, +@antonosmond, @bforchhammer, @brunowego, @cartyc, @chainlink, +@cristian-radu, @dholbach, @dranner-bgt, @fshot, @hiddeco, @isen-ng, +@jonohill, @kingdonb, @mflendrich, @mfrister, @mgenov, @raravena80, +@rndstr, @robertgates55, @sklemmer, @smartpcr, @squaremo, +@stefanprodan, @stefansedich, @yellowmegaman, @ysaakpr for +contributions to this release. + +[fluxcd/flux#2404]: https://github.com/fluxcd/flux/pull/2404 +[fluxcd/flux#2410]: https://github.com/fluxcd/flux/pull/2410 +[fluxcd/flux#2412]: https://github.com/fluxcd/flux/pull/2412 +[fluxcd/flux#2413]: https://github.com/fluxcd/flux/pull/2413 + ## 1.14.1 (2019-08-22) This is a patch release. From 059b8c755867e92a37ab1523177fadaf5095cbd6 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Mon, 2 Sep 2019 11:57:58 +0100 Subject: [PATCH 8/8] Update version in chart, template, generated files --- chart/flux/values.yaml | 2 +- deploy/flux-deployment.yaml | 2 +- install/generated_templates.gogen.go | 14 +++++++------- install/templates/flux-deployment.yaml.tmpl | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml index 7d1333e6b..854b16ffb 100644 --- a/chart/flux/values.yaml +++ b/chart/flux/values.yaml @@ -9,7 +9,7 @@ logFormat: fmt image: repository: docker.io/fluxcd/flux - tag: 1.14.1 + tag: 1.14.2 pullPolicy: IfNotPresent pullSecret: diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml index ffdf1e361..ed0797dfc 100644 --- a/deploy/flux-deployment.yaml +++ b/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/fluxcd/flux:1.14.1 + image: docker.io/fluxcd/flux:1.14.2 imagePullPolicy: IfNotPresent resources: requests: diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go index 5aa3f8dd1..a59630181 100644 --- a/install/generated_templates.gogen.go +++ b/install/generated_templates.gogen.go @@ -19,39 +19,39 @@ var templates = func() http.FileSystem { fs := vfsgen۰FS{ "/": &vfsgen۰DirInfo{ name: "/", - modTime: time.Date(2019, 8, 22, 15, 55, 1, 805050004, time.UTC), + modTime: time.Date(2019, 9, 2, 10, 53, 11, 743589615, time.UTC), }, "/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "flux-account.yaml.tmpl", - modTime: time.Date(2019, 8, 19, 16, 28, 27, 139555385, time.UTC), + modTime: time.Date(2019, 8, 6, 11, 23, 6, 137011753, time.UTC), uncompressedSize: 836, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x92\x4b\xaf\xd3\x30\x10\x85\xf7\xfe\x15\x47\xba\x8b\x0b\xe8\x26\xa8\x3b\x94\x5d\xdb\x05\x0b\x10\x8b\xf0\xd8\x20\x16\x63\x7b\x42\x4d\x5d\x3b\xf2\x23\x3c\xa2\xfc\x77\x94\xa4\x95\x9a\xb6\x20\x55\xba\x3b\x7b\x7c\xc6\x73\xe6\xe8\x2b\x8a\x42\x3c\xe0\xd3\x8e\x11\x39\x74\x46\x31\x48\x29\x9f\x5d\x7a\x82\xb2\x39\x26\x0e\x08\xde\x72\x7c\x02\x39\xbd\x28\x41\x1a\xa7\x8d\xfb\x0e\x0a\x2c\x1e\xe0\x9d\xfd\x0d\xc7\xac\x59\xa3\xf1\x01\xef\xb2\xe4\xe0\x38\x71\xc4\x4f\x93\x76\x53\x4b\x21\x29\xb2\x1e\x27\x70\x8c\x50\xde\xa5\xe0\x2d\x5e\xd4\x9b\xf5\xf6\x65\x29\xa8\x35\x5f\x38\x44\xe3\x5d\x85\x6e\x25\xf6\xc6\xe9\x0a\x1f\x67\x57\xeb\xd9\x94\x38\x70\x22\x4d\x89\x2a\x01\x58\x92\x6c\xe3\x78\x02\x1c\x1d\xb8\x42\x63\xf3\x2f\x71\x7e\xe9\x7b\x98\x06\xe5\x07\x3a\x70\x6c\x49\x31\x86\xe1\xf8\x3e\x5d\x2b\xf4\xfd\xf2\xb5\xef\xc1\x4e\x0f\x83\x18\x73\x39\x37\x14\x24\xa9\x92\x72\xda\xf9\x60\xfe\x50\x32\xde\x95\xfb\x37\xb1\x34\xfe\x75\xb7\x92\x9c\xe8\xe4\x77\x3b\x27\x54\x7b\xcb\xf7\x9a\x15\x21\x5b\x9e\x24\x05\xa8\x35\x6f\x83\xcf\x6d\xac\xf0\xf5\xf1\xd5\xe3\xb7\xa9\x2f\x70\xf4\x39\x28\x5e\x14\x3b\x0e\xf2\xac\x50\xc0\x79\x57\x1f\x85\x9f\xeb\xf7\xff\xd6\x3e\xc3\x86\x9b\x99\x80\xfb\x17\xf5\x96\x6b\x6e\x46\xd1\x69\xd1\xff\xcc\x17\xc0\x75\xb6\x8b\xff\x62\x96\x3f\x58\xa5\x63\x76\x37\xc1\xb9\xb2\x73\x89\xc1\x25\x27\xb7\xc8\xb0\x71\x3c\x69\x6e\x28\xdb\x34\xa3\x32\x12\xf5\x37\x00\x00\xff\xff\xfd\x7f\x67\x6a\x44\x03\x00\x00"), }, "/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "flux-deployment.yaml.tmpl", - modTime: time.Date(2019, 8, 22, 15, 55, 1, 801716648, time.UTC), + modTime: time.Date(2019, 9, 2, 10, 53, 11, 735589583, time.UTC), uncompressedSize: 6456, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x5f\x6f\x1b\x37\x12\x7f\xf7\xa7\x18\x28\x0f\x49\x00\x69\x65\xd5\x6d\x71\xd8\x9e\x0b\xb4\x49\xeb\xcb\xa5\x71\x8c\xf8\x72\x87\x7b\xba\x50\xdc\x91\x96\x10\x97\xdc\xe3\x90\x52\x05\xa3\xdf\xfd\x30\xe4\xfe\xe1\x5a\x72\x52\xe4\xed\xf2\x10\xdb\xdc\xf9\x3f\xc3\xdf\xcc\x70\xb1\x58\x5c\x88\x56\xfd\x13\x1d\x29\x6b\x4a\x10\x6d\x4b\xcb\xfd\xea\x62\xa7\x4c\x55\xc2\x6b\x6c\xb5\x3d\x36\x68\xfc\x45\x83\x5e\x54\xc2\x8b\xf2\x02\xc0\x88\x06\x4b\xd8\xe8\xf0\xfb\xc3\x03\xa8\x0d\x14\xb7\xa2\x41\x6a\x85\x44\xf8\xe3\x8f\xee\x7b\xfc\xb3\x84\x87\x87\xe9\xd7\x87\x07\x40\x53\x31\x19\xb5\x28\x59\x98\xc3\x56\x2b\x29\xa8\x84\xd5\x05\x00\xa1\x46\xe9\xad\xe3\x2f\x00\x8d\xf0\xb2\xfe\x4d\xac\x51\x53\x3a\xc8\x75\x33\xb5\x77\xc2\xe3\xf6\x98\x3e\xfa\x63\x8b\x25\x7c\x40\xe9\x50\x78\xbc\x00\xf0\xd8\xb4\x5a\x78\xec\x84\x65\x1e\xf0\x3f\x61\x8c\xf5\xc2\x2b\x6b\x06\xe1\x00\xad\xb3\x0d\xfa\x1a\x03\x15\xca\x2e\x5b\xeb\x7c\x09\xb3\xab\xcb\xab\xd5\x0c\x9e\x81\x47\xad\x33\x0a\xf0\x16\x48\x3a\xd1\x22\x2c\x1b\xf4\x4e\x49\x62\xe7\x5a\xab\x8c\x7f\x4e\xc0\xcc\x45\x27\x58\x4f\x7c\x78\xe4\x05\x40\x1f\x8b\xf8\x3b\xba\xbd\x92\xf8\x93\x94\x36\x18\x7f\x3b\x25\x04\xd8\x5b\x1d\x1a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0e\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x55\x4c\x70\x46\x55\xe1\x46\x04\xed\xdf\xd9\x0a\x4b\xb8\xfc\xf6\xf2\x12\x9e\xc1\xa1\x46\x03\x0d\x5b\x83\x15\x38\x14\xd5\xc2\x1a\x7d\x9c\xc3\x01\xe1\x60\xcd\x73\x0f\x6b\x04\xb1\xd6\xc8\xf1\x90\x75\x63\xab\x8b\x4e\xe0\x33\xf8\x47\xad\x08\x14\x81\x00\xdf\xb4\x1b\x82\x40\x58\xc1\xc6\x3a\xd8\xa2\x41\x27\xbc\x32\x5b\xb8\xbf\xff\x1b\xec\xf0\x48\x05\xbc\x31\xf0\xf6\x2f\x04\x3f\x5e\xc3\xaa\x58\x5d\xce\x07\x29\xbd\xee\xe4\x02\x81\x70\x98\xdb\x41\x96\x4d\x31\x88\x15\x08\x20\x6c\x05\x17\x45\x17\x28\x38\xe0\x20\x46\x0a\x03\x07\xa7\x3c\x1b\x5a\x9c\x8f\xdf\x16\xcd\x10\x0c\x6c\x5a\x7f\x7c\xad\x5c\x1e\xc4\x06\x2b\x15\x9a\x12\xde\x61\x63\xdd\x31\xf7\x13\x61\x63\xb5\xb6\x07\xf6\xa8\x53\xad\x28\xba\x1a\x88\xcf\x04\xc8\x40\xde\x36\x8a\x23\xb0\x33\xf6\x60\xfe\x53\x5b\xf2\x34\x88\xd8\x28\x8d\x73\x38\xd4\x4a\xd6\x70\xb4\x01\x0e\x4a\xeb\xe4\x94\xb7\x50\x59\xbe\x67\x7c\xcc\x4c\xfc\x8b\x03\x7b\x30\x6c\xf6\x20\xc0\x61\x6b\xc1\x09\x5f\xa3\x03\x5f\x0b\xd3\x29\xde\x2a\x5f\x87\x35\x58\x3e\x44\xd0\x6a\x87\x05\xfc\xdb\x86\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x91\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\x0f\x05\xdc\xe3\x18\xd5\xda\xfb\x96\xca\xe5\xb2\xb2\x92\x0a\x2e\x2c\x59\xf1\xd5\x41\xb3\xe4\xab\x47\x7e\xb9\x0d\xaa\x42\x5a\x06\xc2\x45\xeb\xd4\x5e\x78\x8c\xa5\xc7\x8e\x14\xb5\x6f\xf4\x20\xa9\xcf\x05\x51\xbd\x90\xd6\x6c\xd4\x76\xf8\x04\x90\x0e\xde\x89\xb6\xcc\x0e\xf3\x8b\xb4\xc8\xd8\xbe\x36\x2f\xc5\x2e\xac\x71\x99\x84\x8c\xe5\xf7\xc5\x9c\x1c\x14\xd5\x7c\x52\x8b\x3d\x82\x80\x4a\x6d\x36\xe8\x18\x34\x7b\x09\xdd\xad\x1a\x81\x31\xa6\x20\x89\xcb\x93\xc0\xe0\xb2\x57\x15\xf6\x61\xdf\xa8\x6d\x23\xda\xd1\x10\xe5\x6b\x10\x06\xd0\x78\x77\x8c\x3e\x7c\x4a\x44\x9f\xe6\x20\x4c\x05\xc1\x48\xdb\x30\x5a\x47\xfe\xe4\xed\xbb\x98\x4e\x61\xaa\x41\x0a\x9a\x7d\x94\xa0\x90\xba\x7c\x9e\x64\x80\xc3\xf0\x15\x19\xc8\xd8\xbe\x98\x81\x88\x04\xde\x82\x6a\x18\x27\xe1\xe6\xee\x26\x82\x00\xbc\x60\xb7\x48\x6d\x8d\x32\xa3\x72\x76\x6e\x8f\x4e\x6d\x94\x8c\x80\x0d\x6d\x70\xad\x25\xa4\x97\x7f\x22\x90\x83\x94\x04\x1f\x29\x8a\x1c\x20\xd6\xf7\x27\x02\x07\xc2\x6d\xc7\x6b\xfa\x44\xc4\xb6\xed\x96\xf1\x83\xb2\xd0\x4c\x21\xf8\xd9\x13\x20\x7c\xca\x77\x06\x84\xfb\x70\x0e\x37\xf1\x04\xff\xb3\x0e\xd1\x45\xdd\x61\xc4\x49\x63\x61\x56\xa6\x9b\x38\x03\xd5\x88\x2d\xa6\xea\x67\x86\x02\x7e\x55\xa6\x8a\x3e\x37\x0c\x2b\x0e\xe5\x58\xb5\x09\x52\x34\x0a\x42\x06\x8f\xc8\xca\x49\xe0\x39\x01\x84\x1f\xee\x7d\x1d\xd6\x45\x65\xe5\x0e\x5d\x21\x6d\xb3\x74\xcb\x03\x8a\x3d\x1e\xac\xdb\xd1\x92\x95\x2c\xbd\x18\xc2\xd7\xe7\x92\x7b\x3e\xcf\x03\xac\xd9\x8b\x2d\xb0\xb5\xc5\x40\x13\x55\x95\xd0\x09\x55\x76\x99\x50\x25\xfe\x28\x57\xc5\xea\xdb\x62\x35\xa5\xbd\x0b\x5a\xdf\x59\xad\xe4\xb1\x84\x37\x9b\x5b\xeb\xef\x1c\x52\xee\x89\x43\xb2\xc1\x49\xa4\x1c\xcb\x1d\xfe\x37\x20\xf9\xc9\x19\x80\x6c\x43\x09\xdf\x5d\x36\x93\xc3\x26\xc2\x7d\x09\xdf\x7f\xfb\x4e\x8d\xa3\x82\x75\x39\xf3\x62\xcc\xce\x5d\x1c\x1b\xae\x2e\xaf\xb8\x7b\x2a\xb3\xb1\xae\x89\x65\x2b\xf4\x40\xad\xd5\x1e\x0d\x12\xdd\x39\xbb\xc6\xdc\x02\x0e\xeb\xcd\xb4\x73\x27\x55\x49\xe0\xf4\x58\xf8\xba\x84\xa5\x68\x55\x8a\xf4\xfe\xfb\xa5\xaa\xd0\x78\xe5\x8f\x45\x1b\xd6\x19\xad\x32\xca\x2b\xa1\x5f\xa3\x16\xc7\x7b\xbe\xa3\x15\x95\xf0\x5d\x46\xe0\x55\x83\x36\xf8\x33\xdf\xb8\xd1\xaa\xff\x0f\x53\xb3\x8b\x3b\x49\xcc\xf9\x11\x09\x52\xab\xbb\x4b\x96\xa1\x97\xd1\xb2\x6a\x49\x54\xf3\xac\x67\xd3\xf4\x09\xda\x76\x98\xb3\xe5\x94\x81\x32\xa9\xe6\x9e\x53\xe2\x21\xaa\x97\x13\xa8\xec\x63\xf6\xde\xe8\x63\x09\xde\x05\x64\x69\x3c\x07\x45\x94\x5a\x77\xe0\xce\xd7\xaa\x45\xb7\xb1\x4e\x22\x0b\x4d\x83\x0f\xcf\x3d\x4f\x19\x9e\xcf\x26\x53\xdb\xf7\xc2\x75\xb6\x27\xb2\xaf\x33\x3f\xbb\xa3\x6f\x8c\xd4\x21\xa2\x27\x8f\x6f\xa9\xc9\xf5\xc8\x9a\xe6\x83\x2f\x8c\x33\xfd\x40\xf3\x03\xb3\x3e\x1a\x35\x06\x84\x85\x0a\xa5\x16\x8e\xc7\xb6\xb5\xdd\x67\x00\xf0\x99\x51\x20\x41\x64\xee\xbc\xb3\xd6\x2f\x0b\xa2\xfa\x49\x07\x84\x99\x68\x9d\x8d\x6d\x6a\x96\x34\xcf\x7b\x92\x4c\x02\x9a\xbd\x72\xd6\xc4\xa6\x90\xfa\xed\xec\xed\xc7\x9f\x7f\x79\xf5\xfe\xf6\xd7\x37\x37\xb3\xd4\x06\xe6\x1c\x0f\xbb\x47\xe7\xa6\x3d\x3b\x13\x13\xdb\xdc\xfa\x98\x3a\xaa\xd7\xe7\x7c\x3c\x69\xb6\xa7\x3e\x8e\xc5\xc9\xc4\x4f\x3a\xca\x7d\x8f\x97\x8f\x5e\x1b\xc3\x74\x36\x8e\x74\xd6\xc5\x9c\x64\x22\x1e\x0f\x35\x79\xd2\xe3\x44\xd3\x8f\xdf\xc2\x80\xd0\x1e\x9d\xe1\xf1\xfa\xc4\xe2\x8d\xb3\x0d\x97\x45\x3f\xb5\xcc\x41\x10\x97\x5b\xd7\x59\x39\x0c\xda\xca\x1d\x9d\x26\x1b\xcd\xbe\x3c\x13\x97\x31\xdc\x93\xb8\xec\x85\x0e\x78\x12\x93\x2f\x15\xf1\xe3\x1a\xe8\xfb\xee\x67\x2a\x80\xdb\xfe\xb4\xdd\x7f\xa6\xe1\x3f\x51\x97\x4c\x95\x26\x9c\x09\xdd\x14\x1f\x46\xa3\x59\x65\x39\xf1\x21\xa5\x21\xad\x69\x58\x71\x23\x92\x42\xd6\x58\x71\x64\xf3\xd4\x0e\x93\x25\x27\x91\xc3\x32\xcf\xa4\x58\xd7\x8d\x8e\x19\x43\xb7\x66\x46\xc6\x79\x54\xc2\xeb\x11\x85\xb6\xd5\x47\x0e\x04\xe5\xa1\x18\x07\x38\x7f\xb0\x6c\x65\xe0\x94\xc6\x82\x8b\x3b\x71\xcc\x03\xd4\xf6\x10\x57\x40\x6b\x0c\x4a\x1f\x87\x3b\x3f\x0d\xdd\x62\x31\x38\x10\xe7\x7f\x56\x7e\x3d\x1c\x15\xdd\xdc\x53\xd0\x5e\x16\x52\x07\xf2\xe8\x0a\xc6\x2f\x9d\x87\xe4\x23\xa5\xab\x36\x86\xe2\x55\x22\x7d\x73\x37\x71\x8a\x6f\x1d\xa1\x8f\x2b\xe6\x34\xb1\xa3\x0d\x3d\x3d\x2f\xf2\xde\x31\x65\x5c\xfa\x32\x04\xce\x2d\xee\xa8\xaf\x2f\x26\x83\x96\x22\x68\x02\xc5\x25\x38\x46\x4f\x61\x95\xaa\x69\x1d\x71\x3d\x8e\x38\x71\xf7\x7d\xd1\x2f\x94\x2f\x73\x5b\xfa\xbb\x95\xaa\x90\x27\xb3\x6c\x05\x9e\x18\xc2\x58\x98\xf0\x7d\x51\x29\x77\x7d\x82\xfa\xb9\x59\x1f\xb2\x01\x6b\x4c\xde\xc7\x0f\xbf\xa5\x1d\x5d\x98\x6d\xfa\x76\xa3\x7c\xdc\x1b\x49\x79\xeb\x8e\x03\x5a\xfd\xca\xc3\xe1\x44\x39\xf7\xa0\xe0\xf4\xf5\xc3\x03\x14\x37\xca\xb3\xa4\xf8\xd4\x33\xa5\x58\x3b\x61\x64\xdd\x13\xfd\x1c\xff\x4a\x8f\x3e\x6a\x13\x8f\xf8\x6e\xd0\x39\x4e\x9e\x0f\x98\xef\x3e\xa6\x81\xfe\x6e\x95\xc9\x18\x66\xf3\x59\xf7\x76\xa4\x09\x73\x76\x1e\xaf\x4e\x5b\xd5\x41\x98\x58\x7e\x0e\x39\xab\x32\x4d\xf5\x8d\x30\x6a\xc3\xf3\x1e\x17\x28\xa9\x0a\x5d\xf2\xf5\xd1\xe4\x1c\x77\x5e\x4b\x08\xc1\x54\xe8\x1e\x05\xd0\xa1\x16\x5e\xed\x31\x8e\x33\xd4\xa7\x77\x3b\x09\xe2\xa3\x82\x1f\x9c\xa3\xb0\xae\x94\x5b\xcd\xd3\xcf\x6f\x86\x87\xb0\x31\x38\xf1\xa1\xeb\x5c\x70\xe2\xeb\x51\x1f\xd5\x9e\xea\x8c\x80\x8f\x84\xee\x1c\x7f\x20\x74\x43\xe6\x98\x06\xce\xf3\xff\xd2\x08\x75\xd6\x00\xe4\x0f\xbd\x84\x9e\x6a\x7c\xca\x3b\x0b\xba\xc8\xf7\xf4\x60\x39\xa0\x68\xe2\xf3\x10\xc7\x89\xbb\x81\xf2\x8f\x16\xbc\x3c\x56\x1d\xae\x76\xa8\x79\xfd\x19\x18\xed\x39\x3a\x59\xcc\x75\xfd\xd7\x1d\x1e\x41\x55\x3f\x0e\x64\x9f\x69\x95\x99\x55\x2c\x42\xf8\xe0\x70\xb2\x65\x9e\xd1\x15\x3f\x1f\x17\x03\x3d\x4d\xb0\xa0\x87\x42\x50\x1e\x6a\x41\x11\xe6\xad\xd1\x47\x10\x52\x22\x25\xb8\xac\x31\x3d\xd4\xbc\xe8\xdf\x04\x3e\x6d\x84\x26\xfc\xf4\xf2\x8c\xb6\x9e\x7f\x1a\x60\xf2\x2e\x48\x9f\x14\x1d\xe2\x9e\xc7\x7d\x3f\x78\xa0\xa3\x91\xb0\xb6\x76\xb7\x43\x6c\xb9\x5c\x07\x1d\xb3\xad\xf2\xb3\x39\x34\x28\x38\x52\x7c\xcd\x41\xc4\xc5\xab\xab\xe0\xd0\x92\x77\x28\x9a\xa1\x94\x1f\x5b\xc3\xa2\x17\xe4\x85\xc7\xeb\xad\xf2\x4f\x27\xdc\xe0\xef\xbe\xcf\x7a\xd6\x07\x84\x81\x59\xaf\x63\xd6\xa3\x74\x26\xe4\x05\x16\xdb\x62\x0e\xff\xe2\xcd\x11\x5e\x69\x1b\xaa\x97\x45\x7c\x39\xf0\x76\xc7\x43\x2b\x41\x2b\x9c\x57\x32\x68\xe1\xfa\x28\x76\x52\x1e\x37\x98\x4e\xeb\xf5\x81\x78\x39\x95\x2c\xab\x88\x1b\x69\x91\x56\xd2\x7e\x03\x79\xc4\x16\x15\x5d\x8b\xb5\x5c\x7d\x73\x75\xfa\x7f\xee\xf0\x3d\xba\xfd\x99\x07\x5f\x9e\xb5\xc6\xee\xca\xa5\xfa\x43\x0e\xf3\x62\xc7\xed\x21\xe5\x8a\xd0\x67\xaf\xc8\xcf\xb3\x87\xe8\xec\x45\x99\x5d\x8c\x2f\x23\x71\xde\x99\x82\xb1\x56\xe4\xd1\x2c\x3a\x13\xae\xcb\xab\xcb\xab\xd5\x45\x77\x8d\x7f\xaa\x2a\x95\x76\x4d\x06\xf1\x9f\x78\x86\x99\xe0\xe5\xf8\x7d\xec\xe3\x0f\x0f\xe0\x62\x4b\xf8\x02\xf7\x22\x3e\xe7\x4f\xae\xfe\xf8\x5b\xaf\xe0\x7d\xdb\x89\x7f\x7d\x7b\xdf\x37\x60\x9a\x77\x73\x61\x70\x5d\x3b\x06\x53\x59\x4f\x60\x23\x31\x34\xe2\x18\x77\x74\xbd\x1f\x5f\x6b\x0c\x69\x6b\x77\xa1\x05\x45\x14\x90\xc0\x1a\x20\xdb\x20\xbc\x0d\x6b\x74\x06\x3d\x12\x4b\x0f\x2d\x8d\x8f\x31\x95\xa1\xfe\x19\x60\x76\x6b\x0d\xce\xf2\x2f\xaf\xa2\x01\xf9\x73\x4c\x52\x4e\xd3\x17\x9a\x7e\xbe\x8b\xf6\x4d\xbe\x0c\xa3\xe7\x6c\x35\xbb\xf8\x5f\x00\x00\x00\xff\xff\x5d\x27\x4d\x5d\x38\x19\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x5f\x6f\x1b\xb9\x11\x7f\xf7\xa7\x18\x28\x0f\x49\x00\x69\x65\xc7\xb9\x43\xb1\x57\x1f\x90\x4b\x2e\x6e\x9a\x8b\x63\xc4\x4d\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\x52\x3a\xc1\xb8\xef\x5e\x0c\xb9\x7f\xb8\x96\x9c\x1c\xf2\xd6\x3c\xc4\x36\x77\xfe\xcf\xf0\x37\x33\x5c\x2c\x16\x67\xa2\x55\xff\x44\x47\xca\x9a\x12\x44\xdb\xd2\x72\x77\x71\xb6\x55\xa6\x2a\xe1\x0d\xb6\xda\x1e\x1a\x34\xfe\xac\x41\x2f\x2a\xe1\x45\x79\x06\x60\x44\x83\x25\xac\x75\xf8\xfd\xfe\x1e\xd4\x1a\x8a\x1b\xd1\x20\xb5\x42\x22\xfc\xf1\x47\xf7\x3d\xfe\x59\xc2\xfd\xfd\xf4\xeb\xfd\x3d\xa0\xa9\x98\x8c\x5a\x94\x2c\xcc\x61\xab\x95\x14\x54\xc2\xc5\x19\x00\xa1\x46\xe9\xad\xe3\x2f\x00\x8d\xf0\xb2\xfe\x4d\xac\x50\x53\x3a\xc8\x75\x33\xb5\x77\xc2\xe3\xe6\x90\x3e\xfa\x43\x8b\x25\x7c\x42\xe9\x50\x78\x3c\x03\xf0\xd8\xb4\x5a\x78\xec\x84\x65\x1e\xf0\x3f\x61\x8c\xf5\xc2\x2b\x6b\x06\xe1\x00\xad\xb3\x0d\xfa\x1a\x03\x15\xca\x2e\x5b\xeb\x7c\x09\xb3\xcb\xf3\xcb\x8b\x19\x3c\x01\x8f\x5a\x67\x14\xe0\x2d\x90\x74\xa2\x45\x58\x36\xe8\x9d\x92\xc4\xce\xb5\x56\x19\xff\x94\x80\x99\x8b\x4e\xb0\x9e\xf8\xf0\xc0\x0b\x80\x3e\x16\xf1\x77\x74\x3b\x25\xf1\x95\x94\x36\x18\x7f\x33\x25\x04\xd8\x59\x1d\x1a\x1c\x44\x2d\x3a\x51\x1b\xe5\x17\x5b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x55\x4c\x70\x46\x55\xe1\x5a\x04\xed\x3f\xd8\x0a\x4b\x38\x7f\x79\x7e\x0e\x4f\x60\x5f\xa3\x81\x86\xad\xc1\x0a\x1c\x8a\x6a\x61\x8d\x3e\xcc\x61\x8f\xb0\xb7\xe6\xa9\x87\x15\x82\x58\x69\xe4\x78\xc8\xba\xb1\xd5\x59\x27\xf0\x09\xfc\xa3\x56\x04\x8a\x40\x80\x6f\xda\x35\x41\x20\xac\x60\x6d\x1d\x6c\xd0\xa0\x13\x5e\x99\x0d\xdc\xdd\xfd\x0d\xb6\x78\xa0\x02\xde\x19\x78\xff\x17\x82\x9f\xaf\xe0\xa2\xb8\x38\x9f\x0f\x52\x7a\xdd\xc9\x05\x02\xe1\x30\xb7\x83\x2c\x9b\x62\x10\x2b\x10\x40\xd8\x0a\x2e\x8a\x2e\x50\xb0\xc7\x41\x8c\x14\x06\xf6\x4e\x79\x36\xb4\x38\x1d\xbf\x0d\x9a\x21\x18\xd8\xb4\xfe\xf0\x46\xb9\x3c\x88\x0d\x56\x2a\x34\x25\x7c\xc0\xc6\xba\x43\xee\x27\xc2\xda\x6a\x6d\xf7\xec\x51\xa7\x5a\x51\x74\x35\x10\x9f\x09\x90\x81\xbc\x6d\x14\x47\x60\x6b\xec\xde\xfc\xa7\xb6\xe4\x69\x10\xb1\x56\x1a\xe7\xb0\xaf\x95\xac\xe1\x60\x03\xec\x95\xd6\xc9\x29\x6f\xa1\xb2\x7c\xcf\xf8\x98\x99\xf8\x17\x07\x76\x6f\xd8\xec\x41\x80\xc3\xd6\x82\x13\xbe\x46\x07\xbe\x16\xa6\x53\xbc\x51\xbe\x0e\x2b\xb0\x7c\x88\xa0\xd5\x16\x0b\xf8\xb7\x0d\x4f\xb5\x06\xa1\xc9\xf6\x2a\xa6\xc1\x06\xe5\x41\x19\x6f\x23\x8f\xb4\xc6\x0b\x65\xd0\xcd\x61\x85\xda\xee\x0b\xb8\xc3\x31\xaa\xb5\xf7\x2d\x95\xcb\x65\x65\x25\x15\x5c\x58\xb2\xe2\xab\x83\x66\xc9\x57\x8f\xfc\x72\x13\x54\x85\xb4\x0c\x84\x8b\xd6\xa9\x9d\xf0\x18\x4b\x8f\x1d\x29\x6a\xdf\xe8\x41\x52\x9f\x0b\xa2\x7a\x21\xad\x59\xab\xcd\xf0\x09\x20\x1d\x7c\x10\x6d\x99\x1d\xe6\x17\x69\x91\xb1\x7d\x6f\x5e\x8a\x6d\x58\xe1\x32\x09\x19\xcb\xef\x9b\x39\xd9\x2b\xaa\xf9\xa4\x16\x3b\x04\x01\x95\x5a\xaf\xd1\x31\x68\xf6\x12\xba\x5b\x35\x02\x63\x4c\x41\x12\x97\x27\x81\xc1\x65\xa7\x2a\xec\xc3\xbe\x56\x9b\x46\xb4\xa3\x21\xca\xd7\x20\x0c\xa0\xf1\xee\x10\x7d\xf8\x92\x88\xbe\xcc\x41\x98\x0a\x82\x91\xb6\x61\xb4\x8e\xfc\xc9\xdb\x0f\x31\x9d\xc2\x54\x83\x14\x34\xbb\x28\x41\x21\x75\xf9\x3c\xca\x00\x87\xe1\x3b\x32\x90\xb1\x7d\x33\x03\x11\x09\xbc\x05\xd5\x30\x4e\xc2\xf5\xed\x75\x04\x01\x78\xc6\x6e\x91\xda\x18\x65\x46\xe5\xec\xdc\x0e\x9d\x5a\x2b\x19\x01\x1b\xda\xe0\x5a\x4b\x48\xcf\xff\x44\x20\x07\x29\x09\x3e\x52\x14\x39\x40\xac\xef\x4f\x04\x0e\x84\xdb\x8c\xd7\xf4\x91\x88\x6d\xda\x0d\xe3\x07\x65\xa1\x99\x42\xf0\x93\x47\x40\xf8\x98\xef\x04\x08\xf7\xe1\x1c\x6e\xe2\x11\xfe\x67\x1d\xa2\x8b\xba\xc3\x88\x93\xc6\xc2\xac\x4c\x37\x71\x06\xaa\x11\x1b\x4c\xd5\xcf\x0c\x05\xbc\x55\xa6\x8a\x3e\x37\x0c\x2b\x0e\xe5\x58\xb5\x09\x52\x34\x0a\x42\x06\x8f\xc8\xca\x49\xe0\x39\x01\x84\x1f\xee\x7d\x1d\x56\x45\x65\xe5\x16\x5d\x21\x6d\xb3\x74\xcb\x3d\x8a\x1d\xee\xad\xdb\xd2\x92\x95\x2c\xbd\x18\xc2\xd7\xe7\x92\x7b\x3e\xcf\x03\xac\xd9\x8b\x0d\xb0\xb5\xc5\x40\x13\x55\x95\xd0\x09\x55\x76\x99\x50\x25\xfe\x28\x2f\x8a\x8b\x97\xc5\x8b\x29\xed\x6d\xd0\xfa\xd6\x6a\x25\x0f\x25\xbc\x5b\xdf\x58\x7f\xeb\x90\x72\x4f\x1c\x92\x0d\x4e\x22\xe5\x58\xee\xf0\xbf\x01\xc9\x4f\xce\x00\x64\x1b\x4a\xf8\xe1\xbc\x99\x1c\x36\x11\xee\x4b\xf8\xf1\xe5\x07\x35\x8e\x0a\xd6\xe5\xcc\x8b\x31\x3b\xb7\x71\x6c\xb8\x3c\xbf\xe4\xee\xa9\xcc\xda\xba\x26\x96\xad\xd0\x03\xb5\x56\x3b\x34\x48\x74\xeb\xec\x0a\x73\x0b\x38\xac\xd7\xd3\xce\x9d\x54\x25\x81\xd3\x63\xe1\xeb\x12\x96\xa2\x55\x29\xd2\xbb\x1f\x97\xaa\x42\xe3\x95\x3f\x14\x6d\x58\x65\xb4\xca\x28\xaf\x84\x7e\x83\x5a\x1c\xee\xf8\x8e\x56\x54\xc2\x0f\x19\x81\x57\x0d\xda\xe0\x4f\x7c\xe3\x46\xab\xfe\x3f\x4c\xcd\x2e\xee\x24\x31\xa7\x47\x24\x48\xad\xee\x36\x59\x86\x5e\x46\xcb\xaa\x25\x51\xcd\xb3\x9e\x4d\xd3\x27\x68\xdb\x61\xce\x86\x53\x06\xca\xa4\x9a\x7b\x4a\x89\x87\xa8\x5e\x4e\xa0\xb2\x8f\xd9\x47\xa3\x0f\x25\x78\x17\x90\xa5\xf1\x1c\x14\x51\x6a\xd5\x81\x3b\x5f\xab\x16\xdd\xda\x3a\x89\x2c\x34\x0d\x3e\x3c\xf7\x3c\x66\x78\x3e\x9b\x4c\x6d\xdf\x09\xd7\xd9\x9e\xc8\xbe\xcf\xfc\xec\x8e\xbe\x33\x52\x87\x88\x9e\x3c\xbe\xa5\x26\xd7\x23\x6b\x9a\x0f\xbe\x31\xce\xf4\x03\xcd\x4f\xcc\xfa\x60\xd4\x18\x10\x16\x2a\x94\x5a\x38\x1e\xdb\x56\x76\x97\x01\xc0\x57\x46\x81\x04\x91\xb9\xf3\xce\x5a\xbf\x2c\x88\xea\x47\x1d\x10\x66\xa2\x75\x36\xb6\xa9\x59\xd2\x3c\xef\x49\x32\x09\x68\x76\xca\x59\x13\x9b\x42\xea\xb7\xb3\xf7\x9f\x7f\xf9\xf5\xf5\xc7\x9b\xb7\xef\xae\x67\xa9\x0d\xcc\x39\x1e\x76\x87\xce\x4d\x7b\x76\x26\x26\xb6\xb9\xd5\x21\x75\x54\xaf\x4f\xf9\x78\xd4\x6c\x8f\x7d\x1c\x8b\x93\x89\x1f\x75\x94\xfb\x1e\x2f\x1f\xbd\x36\x86\xe9\x6c\x1c\xe9\xac\x8b\x39\xc9\x44\x3c\x1c\x6a\xf2\xa4\xc7\x89\xa6\x1f\xbf\x85\x01\xa1\x3d\x3a\xc3\xe3\xf5\x91\xc5\x6b\x67\x1b\x2e\x8b\x7e\x6a\x99\x83\x20\x2e\xb7\xae\xb3\x72\x18\xb4\x95\x5b\x3a\x4e\x36\x9a\x5d\x79\x22\x2e\x63\xb8\x27\x71\xd9\x09\x1d\xf0\x28\x26\xdf\x2a\xe2\x87\x35\xd0\xf7\xdd\xaf\x54\x00\xb7\xfd\x69\xbb\xff\x4a\xc3\x7f\xa4\x2e\x99\x2a\x4d\x38\x13\xba\x29\x3e\x8c\x46\xb3\xca\x72\xe2\x43\x4a\x43\x5a\xd3\xb0\xe2\x46\x24\x85\xac\xb1\xe2\xc8\xe6\xa9\x1d\x26\x4b\x4e\x22\x87\x65\x9e\x49\xb1\xae\x1b\x1d\x33\x86\x6e\xcd\x8c\x8c\xf3\xa8\x84\xd7\x23\x0a\x6d\xab\x0f\x1c\x08\xca\x43\x31\x0e\x70\x7e\x6f\xd9\xca\xc0\x29\x8d\x05\x17\x77\xe2\x98\x07\xa8\xed\x3e\xae\x80\xd6\x18\x94\x3e\x0e\x77\x7e\x1a\xba\xc5\x62\x70\x20\xce\xff\xac\xfc\x6a\x38\x2a\xba\xb9\xa7\xa0\x9d\x2c\xa4\x0e\xe4\xd1\x15\x8c\x5f\x3a\x0f\xc9\x67\x4a\x57\x6d\x0c\xc5\xeb\x44\xfa\xee\x76\xe2\x14\xdf\x3a\x42\x1f\x57\xcc\x69\x62\x47\x1b\x7a\x7a\x5e\xe4\xbd\x63\xca\xb8\xf4\x65\x08\x9c\x5b\xdc\x51\x5f\x9d\x4d\x06\x2d\x45\xd0\x04\x8a\x4b\x70\x8c\x9e\xc2\x2a\x55\xd3\x2a\xe2\x7a\x1c\x71\xe2\xee\xfb\xac\x5f\x28\x9f\xe7\xb6\xf4\x77\x2b\x55\x21\x4f\x66\xd9\x0a\x3c\x31\x84\xb1\x30\xe1\xfb\xa2\x52\xee\xea\x08\xf5\x73\xb3\x3e\x65\x03\xd6\x98\xbc\xcf\x9f\x7e\x4b\x3b\xba\x30\x9b\xf4\xed\x5a\xf9\xb8\x37\x92\xf2\xd6\x1d\x06\xb4\x7a\xcb\xc3\xe1\x44\x39\xf7\xa0\xe0\xf4\xd5\xfd\x3d\x14\xd7\xca\xb3\xa4\xf8\xd4\x33\xa5\x58\x39\x61\x64\xdd\x13\xfd\x12\xff\x4a\x8f\x3e\x6a\x1d\x8f\xf8\x6e\xd0\x29\x4e\x9e\x0f\x98\xef\x2e\xa6\x81\xfe\x6e\x95\xc9\x18\x66\xf3\x59\xf7\x76\xa4\x09\x73\x76\x1e\xaf\x8e\x5b\xd5\x5e\x98\x58\x7e\x0e\x39\xab\x32\x4d\xf5\x8d\x30\x6a\xcd\xf3\x1e\x17\x28\xa9\x0a\x5d\xf2\xf5\xc1\xe4\x1c\x77\x5e\x4b\x08\xc1\x54\xe8\x1e\x04\xd0\xa1\x16\x5e\xed\x30\x8e\x33\xd4\xa7\x77\x33\x09\xe2\x83\x82\x1f\x9c\xa3\xb0\xaa\x94\xbb\x98\xa7\x9f\x2f\x86\x87\xb0\x31\x38\xf1\xa1\xeb\x54\x70\xe2\xeb\x51\x1f\xd5\x9e\xea\x84\x80\xcf\x84\xee\x14\x7f\x20\x74\x43\xe6\x98\x06\x4e\xf3\xff\xda\x08\x75\xd2\x00\xe4\x0f\xbd\x84\x9e\x6a\x7c\xca\x3b\x09\xba\xc8\xf7\x74\x6f\x39\xa0\x68\xe2\xf3\x10\xc7\x89\xbb\x81\xf2\x0f\x16\xbc\x3c\x56\x1d\xae\x76\xa8\x79\xf5\x15\x18\xed\x39\x3a\x59\xcc\x75\xf5\xd7\x2d\x1e\x40\x55\x3f\x0f\x64\x5f\x69\x95\x99\x55\x2c\x42\xf8\xe0\x70\xb2\x65\x9e\xd0\x15\x3f\x1f\x16\x03\x3d\x4d\xb0\xa0\x87\x42\x50\x1e\x6a\x41\x11\xe6\xad\xd1\x07\x10\x52\x22\x25\xb8\xac\x31\x3d\xd4\x3c\xeb\xdf\x04\xbe\xac\x85\x26\xfc\xf2\xfc\x84\xb6\x9e\x7f\x1a\x60\xf2\x2e\x48\x9f\x14\xed\xe3\x9e\xc7\x7d\x3f\x78\xa0\x83\x91\xb0\xb2\x76\xbb\x45\x6c\xb9\x5c\x07\x1d\xb3\x8d\xf2\xb3\x39\x34\x28\x38\x52\x7c\xcd\x41\xc4\xc5\xab\xab\xe0\xd0\x92\x77\x28\x9a\xa1\x94\x1f\x5a\xc3\xa2\x17\xe4\x85\xc7\xab\x8d\xf2\x8f\x27\xdc\xe0\xef\xbe\xcf\x7a\xd6\x07\x84\x81\x59\xaf\x63\xd6\xa3\x74\x26\xe4\x19\x16\x9b\x62\x0e\xff\xe2\xcd\x11\x5e\x6b\x1b\xaa\xe7\x45\x7c\x39\xf0\x76\xcb\x43\x2b\x41\x2b\x9c\x57\x32\x68\xe1\xfa\x28\x76\x52\x1e\x36\x98\x4e\xeb\xd5\x9e\x78\x39\x95\x2c\xab\x88\x1b\x69\x91\x56\xd2\x7e\x03\x79\xc0\x16\x15\x5d\x89\x95\xbc\x78\x71\x79\xfc\x7f\xee\xf0\x1d\xba\xdd\x89\x07\x5f\x9e\xb5\xc6\xee\xca\xa5\xfa\x53\x0e\xf3\x62\xcb\xed\x21\xe5\x8a\xd0\x67\xaf\xc8\x4f\xb3\x87\xe8\xec\x45\x99\x5d\x8c\x2f\x23\x71\xde\x99\x82\xb1\x56\xe4\xd1\x2c\x3a\x13\xae\xca\xcb\xf3\xcb\x8b\xb3\xee\x1a\xbf\xaa\x2a\x95\x76\x4d\x06\xf1\x57\x3c\xc3\x4c\xf0\x72\xfc\x3e\xf6\xf1\xfb\x7b\x70\xb1\x25\x7c\x83\x7b\x11\x9f\xf3\x27\x57\x7f\xfc\xad\x57\xf0\xb1\xed\xc4\xbf\xb9\xb9\xeb\x1b\x30\xcd\xbb\xb9\x30\xb8\xae\x1d\x83\xa9\xac\x27\xb0\x91\x18\x1a\x71\x88\x3b\xba\xde\x8d\xaf\x35\x86\xb4\xb5\xdb\xd0\x82\x22\x0a\x48\x60\x0d\x90\x6d\x10\xde\x87\x15\x3a\x83\x1e\x89\xa5\x87\x96\xc6\xc7\x98\xca\x50\xff\x0c\x30\xbb\xb1\x06\x67\xf9\x97\xd7\xd1\x80\xfc\x39\x26\x29\xa7\xe9\x0b\x4d\x3f\xdf\x45\xfb\x26\x5f\x86\xd1\x73\x76\x31\x3b\xfb\x5f\x00\x00\x00\xff\xff\x6c\x75\x4a\x7a\x38\x19\x00\x00"), }, "/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "flux-secret.yaml.tmpl", - modTime: time.Date(2019, 8, 19, 16, 28, 27, 142888746, time.UTC), + modTime: time.Date(2019, 8, 6, 11, 23, 6, 137011753, time.UTC), uncompressedSize: 137, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xca\x31\x0a\xc2\x40\x10\x85\xe1\x7e\x4f\xf1\x2e\xb0\x82\xed\x1c\x42\x0b\xc1\x7e\xc8\xbe\xc8\x62\xb2\x19\x93\x89\x18\x86\xdc\x5d\x14\x1b\xcb\x9f\xff\xcb\x39\x27\xb5\x7a\xe5\xbc\xd4\xa9\x09\x9e\xc7\x74\xaf\xad\x08\x2e\xec\x66\x7a\x1a\xe9\x5a\xd4\x55\x12\xd0\x74\xa4\xa0\x1f\xd6\x57\xbe\x55\xcf\x85\x36\x4c\x5b\x04\x6a\x8f\xc3\x49\x47\x2e\xa6\x1d\xb1\xef\x3f\xfa\x4d\x41\xc4\xff\x8d\x00\x5b\xf9\x30\xdf\x8c\x82\xb3\xe9\x63\x65\x7a\x07\x00\x00\xff\xff\x40\x21\xa1\xbb\x89\x00\x00\x00"), }, "/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "memcache-dep.yaml.tmpl", - modTime: time.Date(2019, 8, 19, 16, 28, 27, 142888746, time.UTC), + modTime: time.Date(2019, 8, 6, 11, 23, 6, 137011753, time.UTC), uncompressedSize: 874, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x93\xcd\x6e\x9c\x40\x10\x84\xef\x3c\x45\x49\x7b\x0d\x1b\x61\x69\x2f\xdc\xa2\x38\x89\x2c\x25\xd6\x5e\x9c\x7b\x7b\x68\xf0\x28\xf3\x97\xe9\x66\xb3\x04\xf9\xdd\xa3\xd9\x5f\x36\xf6\x9c\x80\xaa\xaf\xa7\xa6\x80\xba\xae\xab\x15\x3c\x7b\x43\xe6\x85\x3b\x74\x9c\x5c\x9c\x3c\x07\xc5\x28\xdc\xe1\x79\xc2\x57\x37\xee\xa1\x11\x07\x47\xb5\x82\x89\x41\xc9\x06\xce\xb0\x9e\x06\x86\x67\xa5\x8e\x94\xd6\x15\x25\xfb\x93\xb3\xd8\x18\x5a\x50\x4a\xf2\x71\xd7\x54\xbf\x6c\xe8\x5a\xdc\x5f\xc6\x56\x67\x7b\x5b\x01\x81\x3c\xb7\xd7\xdd\xe7\x19\xb6\xc7\xfa\x91\x3c\x4b\x22\xc3\x78\x7d\x3d\x99\x0e\xb7\x2d\xe6\xf9\x56\x9d\x67\x70\xe8\x8a\x4d\x12\x9b\x32\x31\x73\x72\xd6\x90\xb4\x68\x2a\x40\xd8\xb1\xd1\x98\x8b\x02\x78\x52\xf3\xf2\x9d\x9e\xd9\xc9\xf1\xc1\x9b\x00\x15\xa0\xec\x93\x23\xe5\x13\xb2\x08\x5b\x96\xbb\xa1\xdf\xe3\x81\x73\x94\xb2\x2e\x5d\x5d\x98\xfa\x5d\xa6\xac\x43\x9b\x0b\xa1\x6d\xd6\x9b\x75\xb3\xb9\xd5\xb7\xa3\x73\xdb\xe8\xac\x99\x5a\x3c\xf4\x8f\x51\xb7\x99\xa5\xd4\x7a\x76\x51\x1e\x16\xf9\x6a\xd4\x1e\x9b\xe6\x0e\xc0\x0a\x3f\x68\x6f\xfd\xe8\xcb\x0e\x31\x4f\xe5\x95\x8e\xc2\x1f\x60\x03\x3c\x0f\xf4\x3c\x29\xcb\x12\x7c\xc0\xc6\xe3\x06\x14\xfb\x97\xd1\xc7\x8c\x18\x18\x56\xd9\x2f\xed\x09\x4d\x73\xd7\x34\x58\xe1\x9e\x7b\x1a\x9d\x22\xc5\x7c\xcd\xb5\x2a\x9e\xdd\xee\x78\xf9\x14\x4c\xf4\x87\x8f\x4c\x23\x06\x56\xb8\x38\x08\x62\x0f\x26\xf3\x82\xcc\xbf\x47\x16\x05\x85\x0e\x99\x25\xc5\x20\xbc\xbe\x0c\x2a\x53\x6f\x4e\x78\xec\xd3\x38\xcb\x41\xaf\x07\x58\x74\xbf\x8d\x59\xdb\x63\xba\x8b\x2c\x6c\xc6\x6c\x75\xfa\x1c\x83\xf2\x5e\xdb\x05\x97\xc7\xf0\x49\x9e\x84\xf3\xff\xcc\x49\xfa\x96\xe3\x98\xde\x6a\xe4\x5c\xfc\xb3\xcd\x76\x67\x1d\x0f\xfc\x45\x0c\x39\xd2\xc3\xaf\xd0\x93\x13\xae\xfe\x05\x00\x00\xff\xff\x5d\x9a\x63\xab\x6a\x03\x00\x00"), }, "/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{ name: "memcache-svc.yaml.tmpl", - modTime: time.Date(2019, 8, 19, 16, 28, 27, 142888746, time.UTC), + modTime: time.Date(2019, 8, 6, 11, 23, 6, 137011753, time.UTC), uncompressedSize: 206, compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8c\x3d\x0e\x02\x21\x10\x46\x7b\x4e\xf1\x5d\x00\x13\x2c\x39\x84\x8d\x89\xfd\x04\x3e\x23\x51\x58\x02\x64\x9b\xc9\xde\xdd\xb0\x6b\xe3\x76\xf3\xf3\xde\xb3\xd6\x1a\xa9\xe9\xc1\xd6\xd3\x52\x3c\x56\x67\xde\xa9\x44\x8f\x3b\xdb\x9a\x02\x4d\xe6\x90\x28\x43\xbc\x01\x8a\x64\x7a\x64\xe6\x20\xe1\xc5\xa8\x8a\xf4\xc4\xe5\x26\x99\xbd\x4a\x20\xb6\xed\x07\xed\xab\x87\xea\xff\x57\x15\x2c\x71\x62\xbd\x32\xcc\x62\x5d\xda\xe8\x73\x00\xec\x39\xbf\x5f\x0f\xc4\xc3\xb9\xab\x73\x06\xe8\xfc\x30\x8c\xa5\x1d\xce\xd9\xf8\x06\x00\x00\xff\xff\x20\x2f\xef\xba\xce\x00\x00\x00"), diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl index e0c36f622..b246298aa 100644 --- a/install/templates/flux-deployment.yaml.tmpl +++ b/install/templates/flux-deployment.yaml.tmpl @@ -64,7 +64,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/fluxcd/flux:1.14.1 + image: docker.io/fluxcd/flux:1.14.2 imagePullPolicy: IfNotPresent resources: requests: