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

Commit 493cde9

Browse files
authored
Merge pull request #375 from fluxcd/release/1.0.1
2 parents 8d71b00 + df3ef31 commit 493cde9

12 files changed

+44
-12
lines changed

CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## 1.0.1 (2020-04-15)
2+
3+
This is a patch release.
4+
5+
### Bug fixes
6+
7+
- release: do not swallow dependency update errors
8+
[fluxcd/helm-operator#372][#372]
9+
10+
### Thanks
11+
12+
Thanks to @brew, @qvmedvedev, @stefansedich, @hiddeco,
13+
@stefanprodan, and others for their contributions to this release,
14+
feedback, and reporting issues.
15+
16+
[#372]: https://github.com/fluxcd/helm-operator/pull/372
17+
118
## 1.0.0 (2020-04-07)
219

320
> **Notice:** upgrading to this version from `<=0.10.x` by just

chart/helm-operator/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 1.0.0 (2020-04-08)
2+
3+
### Improvements
4+
5+
- Update Helm Operator to `1.0.0`
6+
[fluxcd/helm-operator#354](https://github.com/fluxcd/helm-operator/pull/354)
7+
- Tune chart defaults for production use
8+
[fluxcd/helm-operator#353](https://github.com/fluxcd/helm-operator/pull/353)
9+
- Add hostAliases to chart options
10+
[fluxcd/helm-operator#328](https://github.com/fluxcd/helm-operator/pull/328)
11+
112
## 0.7.0 (2020-02-14)
213

314
### Improvements

chart/helm-operator/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
2-
appVersion: "1.0.0"
3-
version: 0.7.0
2+
appVersion: "1.0.1"
3+
version: 1.0.0
44
kubeVersion: ">=1.11.0-0"
55
name: helm-operator
66
description: Flux Helm Operator is a CRD controller for declarative helming

chart/helm-operator/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ chart and their default values.
6565
| `resources.requests.cpu` | `50m` | CPU resource requests for the deployment
6666
| `resources.requests.memory` | `64Mi` | Memory resource requests for the deployment
6767
| `resources.requests.cpu` | `None` | CPU resource limits for the deployment
68-
| `resources.limits.memory` | `1Gi` | Memory resource limits for the deployment
68+
| `resources.limits.memory` | `None` | Memory resource limits for the deployment
6969
| `nodeSelector` | `{}` | Node Selector properties for the deployment
7070
| `tolerations` | `[]` | Tolerations properties for the deployment
7171
| `affinity` | `{}` | Affinity properties for the deployment

chart/helm-operator/templates/deployment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ spec:
1313
matchLabels:
1414
app: {{ template "helm-operator.name" . }}
1515
release: {{ .Release.Name }}
16+
strategy:
17+
type: Recreate
1618
template:
1719
metadata:
1820
annotations:

chart/helm-operator/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fullnameOverride: ""
55

66
image:
77
repository: docker.io/fluxcd/helm-operator
8-
tag: 1.0.0-rc9
8+
tag: 1.0.1
99
pullPolicy: IfNotPresent
1010
pullSecret:
1111

@@ -195,8 +195,8 @@ extraVolumeMounts: []
195195
extraVolumes: []
196196
initContainers: []
197197
resources:
198-
limits:
199-
memory: 1Gi
198+
# limits:
199+
# memory: 1Gi
200200
requests:
201201
cpu: 50m
202202
memory: 64Mi

deploy/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ spec:
7878
# There are no ":latest" images for helm-operator. Find the most recent
7979
# release or image version at https://hub.docker.com/r/fluxcd/helm-operator/tags
8080
# and replace the tag here.
81-
image: docker.io/fluxcd/helm-operator:1.0.0
81+
image: docker.io/fluxcd/helm-operator:1.0.1
8282
imagePullPolicy: IfNotPresent
8383
ports:
8484
- name: http

deploy/weave-cloud-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
secretName: flux-git-deploy
2828
containers:
2929
- name: helm-operator
30-
image: docker.io/fluxcd/helm-operator:1.0.0
30+
image: docker.io/fluxcd/helm-operator:1.0.1
3131
imagePullPolicy: IfNotPresent
3232
args:
3333
- --git-timeout=20s

mkdocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repo_url: https://github.com/fluxcd/helm-operator
99
edit_uri: ""
1010

1111
extra:
12-
version: 1.0.0
12+
version: 1.0.1
1313
social:
1414
- type: 'github'
1515
link: 'https://github.com/fluxcd/helm-operator'

pkg/install/generated_templates.gogen.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/install/templates/deployment.yaml.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
# There are no ":latest" images for helm-operator. Find the most recent
8787
# release or image version at https://hub.docker.com/r/fluxcd/helm-operator/tags
8888
# and replace the tag here.
89-
image: docker.io/fluxcd/helm-operator:1.0.0
89+
image: docker.io/fluxcd/helm-operator:1.0.1
9090
imagePullPolicy: IfNotPresent
9191
ports:
9292
- name: http

pkg/release/release.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ func (r *Release) prepareChart(client helm.Client, hr *v1.HelmRelease) (chart, f
146146
return 0 < len(i)
147147
}()
148148
if r.config.UpdateDeps && !hr.Spec.GitChartSource.SkipDepUpdate {
149-
client.DependencyUpdate(chartPath)
149+
if err := client.DependencyUpdate(chartPath); err != nil {
150+
return chart{}, nil, err
151+
}
150152
}
151153
return chart{chartPath, revision, changed}, export.Clean, nil
152154
case hr.Spec.RepoChartSource != nil && hr.Spec.RepoURL != "" && hr.Spec.Name != "" && hr.Spec.Version != "":

0 commit comments

Comments
 (0)