Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Housekeeping: merge release/helm-0.7.x back into master #1869

Merged
merged 4 commits into from
Mar 27, 2019
Merged

Housekeeping: merge release/helm-0.7.x back into master #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4337ad
Init result values to prevent panic on merge
hiddeco Mar 27, 2019
d93624e
Add changelog entry for Helm operator v0.7.1
hiddeco Mar 27, 2019
5302d17
Update Helm operator manifests to '0.7.1'
hiddeco Mar 27, 2019
4c4a2f1
Merge pull request #1868 from weaveworks/release/helm-0.7.1
hiddeco Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CHANGELOG-helmop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
## 0.7.0 (2019-03-05)
## 0.7.1 (2019-03-27)

### Bug fixes

- Prevent panic on `.spec.values` in `HelmRelease` due to merge
attempt on uninitialized value
[weaveworks/flux#1867](https://github.com/weaveworks/flux/pull/1867)

## 0.7.0 (2019-03-25)

### Bug fixes

Expand Down
2 changes: 1 addition & 1 deletion deploy-helm/helm-operator-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
# There are no ":latest" images for helm-operator. Find the most recent
# release or image version at https://quay.io/weaveworks/helm-operator
# and replace the tag here.
image: quay.io/weaveworks/helm-operator:0.7.0
image: quay.io/weaveworks/helm-operator:0.7.1
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion deploy-helm/weave-cloud-helm-operator-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secretName: flux-git-deploy
containers:
- name: flux-helm-operator
image: quay.io/weaveworks/helm-operator:0.7.0
image: quay.io/weaveworks/helm-operator:0.7.1
imagePullPolicy: IfNotPresent
args:
- --git-timeout=20s
Expand Down
2 changes: 1 addition & 1 deletion integrations/helm/release/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func fhrResourceID(fhr flux_v1beta1.HelmRelease) flux.ResourceID {
// values tries to resolve all given value file sources and merges
// them into one Values struct. It returns the merged Values.
func values(corev1 k8sclientv1.CoreV1Interface, ns string, valuesFromSource []flux_v1beta1.ValuesFromSource, values chartutil.Values) (chartutil.Values, error) {
var result chartutil.Values
result := chartutil.Values{}

for _, v := range valuesFromSource {
var valueFile chartutil.Values
Expand Down