Release 1.0.0-rc7 (#197)

Release 1.0.0-rc7

CHANGELOG.md

@@ -1,3 +1,45 @@
+## 1.0.0-rc7 (2019-01-10)
+
+> **Notice:** upgrading to this version from `<=0.10.x` by just
+> updating your Helm Operator image tag is not possible as the
+> CRD domain and version have changed. An upgrade guide can be
+> found [here](./docs/guides/upgrading-to-ga.md).
+
+### Bug fixes
+
+ - release: ignore manifest in annotator if we fail to unmarshal
+   [fluxcd/helm-operator#190][#190]
+ - helm/v2: if present, use alias to pull a chart so that the
+   configured credentials are used
+   [fluxcd/helm-operator#193][#193]
+ - helm/v3: if present, use alias to pull a chart so that the
+   configured credentials are used
+   [fluxcd/helm-operator#193][#193]
+ - helm/v3: prevent spurious upgrades due to missing dependencies
+   in chart metadata
+   [fluxcd/helm-operator#196][#196]
+
+### Enhancements
+
+ - helm: only log errors on repository index
+   [fluxcd/helm-operator#193][#193]
+
+### Maintenance and documentation
+
+ - Pkg: update Flux package to `v1.17.0` (`kube-1.16` branch)
+   [fluxcd/helm-operator#177][#177]
+
+### Thanks
+
+Thanks to @stefansedich, @domg123, @gaieges, @PaulFarver, @rowecharles,
+@apenney, @stefanprodan, @hiddeco, and others for their contributions
+to this release, feedback, and reporting issues.
+
+[#177]: https://github.com/fluxcd/helm-operator/pull/177
+[#190]: https://github.com/fluxcd/helm-operator/pull/190
+[#193]: https://github.com/fluxcd/helm-operator/pull/193
+[#196]: https://github.com/fluxcd/helm-operator/pull/196
+
 ## 1.0.0-rc6 (2019-01-08)
 
 > **Notice:** upgrading to this version from `<=0.10.x` by just

chart/helm-operator/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.0.0-rc6"
+appVersion: "1.0.0-rc7"
 version: 0.4.0
 kubeVersion: ">=1.11.0-0"
 name: helm-operator

chart/helm-operator/templates/deployment.yaml

@@ -136,18 +136,31 @@ spec:
         {{- end }}
         {{- if .Values.configureRepositories.enable }}
         - name: {{ .Values.configureRepositories.volumeName | quote }}
-          mountPath: /var/fluxd/helm/repository/repositories.yaml
+          mountPath: /root/.helm/repository/repositories.yaml
           subPath: repositories.yaml
           readOnly: true
+        {{- if contains "v2" .Values.helm.versions }}
         - name: {{ .Values.configureRepositories.cacheVolumeName | quote }}
           mountPath: /var/fluxd/helm/repository/cache
+          subPath: v2
+        {{- end }}
+        {{- if contains "v3" .Values.helm.versions }}
+        - name: {{ .Values.configureRepositories.cacheVolumeName | quote }}
+          mountPath: /root/.cache/helm/repository
+          subPath: v3
+        {{- end }}
         {{- end }}
         {{- if .Values.extraVolumeMounts }}
 {{ toYaml .Values.extraVolumeMounts | indent 8 }}
         {{- end }}
         args:
         {{- if .Values.helm.versions }}
         - --enabled-helm-versions={{ .Values.helm.versions }}
+        {{- if .Values.configureRepositories.enable }}
+        {{- range $version := splitList "," .Values.helm.versions }}
+        - --helm-repository-import={{ $version }}:/root/.helm/repository/repositories.yaml
+        {{- end }}
+        {{- end }}
         {{- end }}
         {{- if .Values.logFormat }}
         - --log-format={{ .Values.logFormat }}

chart/helm-operator/values.yaml

@@ -5,7 +5,7 @@ fullnameOverride: ""
 
 image:
   repository: docker.io/fluxcd/helm-operator
-  tag: 1.0.0-rc6
+  tag: 1.0.0-rc7
   pullPolicy: IfNotPresent
   pullSecret:
 

deploy/helm-operator-deployment.yaml

@@ -76,7 +76,7 @@ spec:
         # There are no ":latest" images for helm-operator. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/helm-operator/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/helm-operator:1.0.0-rc6
+        image: docker.io/fluxcd/helm-operator:1.0.0-rc7
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

deploy/weave-cloud-helm-operator-deployment.yaml

@@ -27,7 +27,7 @@ spec:
             secretName: flux-git-deploy
       containers:
         - name: flux-helm-operator
-          image: docker.io/fluxcd/helm-operator:1.0.0-rc6
+          image: docker.io/fluxcd/helm-operator:1.0.0-rc7
           imagePullPolicy: IfNotPresent
           args:
             - --git-timeout=20s

go.mod

@@ -3,23 +3,20 @@ module github.com/fluxcd/helm-operator
 go 1.13
 
 require (
-	github.com/bugsnag/bugsnag-go v1.5.3 // indirect
-	github.com/fluxcd/flux v1.15.0
+	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/fluxcd/flux v1.17.1-0.20200109130101-ca3e8f451dd0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-kit/kit v0.9.0
 	github.com/golang/protobuf v1.3.2
 	github.com/google/go-cmp v0.3.1
-	github.com/gorilla/handlers v1.4.2 // indirect
 	github.com/gorilla/mux v1.7.1
-	github.com/gosuri/uitable v0.0.3 // indirect
 	github.com/instrumenta/kubeval v0.0.0-20190804145309-805845b47dfc
 	github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.2.1
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
-	github.com/yvasiyarov/gorelic v0.0.7 // indirect
 	google.golang.org/grpc v1.24.0
 	helm.sh/helm/v3 v3.0.2
 	k8s.io/api v0.0.0-20191016110408-35e52d86657a // kubernetes-1.16.2
@@ -29,7 +26,6 @@ require (
 	k8s.io/helm v2.16.1+incompatible
 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51 // kubernetes-1.16.2
-	rsc.io/letsencrypt v0.0.3 // indirect
 )
 
 // Transitive requirement from Flux: remove when https://github.com/docker/distribution/pull/2905 is released.
@@ -47,3 +43,6 @@ replace github.com/docker/docker => github.com/docker/docker v0.7.3-0.2019032701
 //         +-> github.com/weaveworks/[email protected]
 //             +-> k8s.io/[email protected]+incompatible
 replace k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48 // kubernetes-1.16.2
+
+// Pin Flux to kube-1.16 branch to break weaveworks/flux circular dependency (to be removed on Flux 1.18)
+replace github.com/fluxcd/flux => github.com/fluxcd/flux v1.17.1-0.20200109130101-ca3e8f451dd0