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

Commit f6fd8f3

Browse files
author
Kingdon Barrett
authored
Merge pull request #639 from fluxcd/release/1.4.1
Release 1.4.1
2 parents 7a958ba + 9b4638b commit f6fd8f3

File tree

12 files changed

+272
-217
lines changed

12 files changed

+272
-217
lines changed

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 1.4.1 (2021-11-26)
2+
3+
This release of Helm Operator has no code changes, only base image and dependency updates.
4+
5+
### Maintenance
6+
7+
- Release 1.4.1 [fluxcd/helm-operator#639][#639]
8+
9+
> **Helm Operator and Flux v1 are in maintenance:**
10+
11+
Please note, while we continue the Helm Operator support, there are some known issues in Helm Operator that cannot be addressed. Users are advised strongly to plan their infrastructure upgrades and [migrate to Flux v2 and Helm Controller](https://fluxcd.io/docs/migration/helm-operator-migration/) as soon as possible, as Helm Operator will soon [no longer be maintained](https://fluxcd.io/docs/migration/timetable/).
12+
13+
[#639]: https://github.com/fluxcd/helm-operator/pull/639
14+
115
## 1.4.0 (2021-07-08)
216

317
> **Note: Breaking Changes**

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Agenda and minutes of previous Flux Dev meetings can be reviewed in this
4747
[Google doc](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit#).
4848

4949
Meeting recordings can be viewed in this [Youtube
50-
playlist](https://www.youtube.com/playlist?list=PLbx4FZ4kOKntmgJqaT-iJ8tn4xat150yL).
50+
playlist](https://www.youtube.com/playlist?list=PLwjBY07V76p5mWNgdINjIiuUiItIeLhIN).
5151

5252
## Getting Started
5353

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ cache/%/kubectl-$(KUBECTL_VERSION): docker/kubectl.version
9898

9999
cache/%/helm-$(HELM2_VERSION): docker/helm2.version
100100
mkdir -p cache/$*
101-
curl --fail -L -o cache/$*/helm-$(HELM2_VERSION).tar.gz "https://storage.googleapis.com/kubernetes-helm/helm-v$(HELM2_VERSION)-$*.tar.gz"
101+
curl --fail -L -o cache/$*/helm-$(HELM2_VERSION).tar.gz "https://get.helm.sh/helm-v$(HELM2_VERSION)-$*.tar.gz"
102102
[ $* != "linux-$(ARCH)" ] || echo "$(HELM2_CHECKSUM_$(ARCH)) cache/$*/helm-$(HELM2_VERSION).tar.gz" | shasum -a 256 -c
103103
tar -m -C ./cache -xzf cache/$*/helm-$(HELM2_VERSION).tar.gz $*/helm
104104
mv cache/$*/helm $@

‎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.4.0"
3-
version: 1.2.0
2+
appVersion: "1.4.1"
3+
version: 1.4.1
44
kubeVersion: ">=1.16.0-0"
55
name: helm-operator
66
description: Flux Helm Operator is a CRD controller for declarative helming

‎chart/helm-operator/values.yaml

+1-1
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.4.0
8+
tag: 1.4.1
99
pullPolicy: IfNotPresent
1010
pullSecret:
1111

‎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.4.0
81+
image: docker.io/fluxcd/helm-operator:1.4.1
8282
imagePullPolicy: IfNotPresent
8383
ports:
8484
- name: http

‎docker/helm3.version

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
HELM3_VERSION=3.5.4
2-
HELM3_CHECKSUM_amd64=a8ddb4e30435b5fd45308ecce5eaad676d64a5de9c89660b56face3fe990b318
3-
HELM3_CHECKSUM_arm=1a9cc09ef06db29a0232d265f73625056a0cb089e5a16b0a5ef8e810e0533157
4-
HELM3_CHECKSUM_arm64=9db01522150a83a5d65b420171147448d8396c142d2c91af95e5ee77c1694176
1+
HELM3_VERSION=3.6.3
2+
HELM3_CHECKSUM_amd64=07c100849925623dc1913209cd1a30f0a9b80a5b4d6ff2153c609d11b043e262
3+
HELM3_CHECKSUM_arm=6918e573a70c309fbf6385a0a0d18d090c10b44d318724f1f73e47ede4809635
4+
HELM3_CHECKSUM_arm64=6fe647628bc27e7ae77d015da4d5e1c63024f673062ac7bc11453ccc55657713

‎docker/known_hosts.sh

+2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ diff - "$fingerprints" <<EOF
4646
2048 SHA256:ohD8VZEXGWo6Ez8GSEJQ9WpafgLFsOfLOtGGQCQo6Og ssh.dev.azure.com (RSA)
4747
2048 SHA256:ohD8VZEXGWo6Ez8GSEJQ9WpafgLFsOfLOtGGQCQo6Og vs-ssh.visualstudio.com (RSA)
4848
2048 SHA256:zzXQOXSRBEiUtuE8AikJYKwbHaxvSc0ojez9YXaGp1A bitbucket.org (RSA)
49+
256 SHA256:+DiY3wvvV6TuJJhbpZisF/zLDA0zPMSvHdkr4UvCOqU github.com (ED25519)
4950
256 SHA256:AGvEpqYNMqsRNIviwyk4J4HM0lEylomDBKOWZsBn434 [source.developers.google.com]:2022 (ECDSA)
5051
256 SHA256:HbW3g8zUjNSksFbqTiUWPWg2Bq1x8xdGUrliXFzSnUw gitlab.com (ECDSA)
5152
256 SHA256:eUXGGm1YGsMAS7vkcx6JOJdOGHPem5gQp4taiCfCLB8 gitlab.com (ED25519)
53+
256 SHA256:p2QAMXNIC1TJYWeIOttrVc98/R1BUFWu3/LiyKgUfQM github.com (ECDSA)
5254
EOF
5355

5456
}

‎go.mod

+30-19
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ module github.com/fluxcd/helm-operator
33
go 1.14
44

55
require (
6+
github.com/bitly/go-simplejson v0.5.0 // indirect
7+
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
8+
github.com/bshuster-repo/logrus-logstash-hook v1.0.2 // indirect
69
github.com/bugsnag/panicwrap v1.2.0 // indirect
710
github.com/docker/go-metrics v0.0.1 // indirect
811
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
@@ -12,12 +15,11 @@ require (
1215
github.com/garyburd/redigo v1.6.0 // indirect
1316
github.com/go-kit/kit v0.10.0
1417
github.com/gofrs/uuid v3.2.0+incompatible // indirect
15-
github.com/golang/protobuf v1.4.3
16-
github.com/google/go-cmp v0.5.2
18+
github.com/golang/protobuf v1.5.0
19+
github.com/google/go-cmp v0.5.5
1720
github.com/gorilla/mux v1.7.3
1821
github.com/helm/helm-2to3 v0.8.2
1922
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
20-
github.com/kr/text v0.2.0 // indirect
2123
github.com/mattn/go-colorable v0.1.6 // indirect
2224
github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
2325
github.com/pkg/errors v0.9.1
@@ -27,16 +29,16 @@ require (
2729
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
2830
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
2931
google.golang.org/grpc v1.27.1
30-
helm.sh/helm/v3 v3.5.4
31-
k8s.io/api v0.20.4
32-
k8s.io/apiextensions-apiserver v0.20.4
33-
k8s.io/apimachinery v0.20.4
34-
k8s.io/cli-runtime v0.20.4
32+
helm.sh/helm/v3 v3.6.3
33+
k8s.io/api v0.21.7
34+
k8s.io/apiextensions-apiserver v0.21.7
35+
k8s.io/apimachinery v0.21.7
36+
k8s.io/cli-runtime v0.21.7
3537
k8s.io/client-go v11.0.0+incompatible
3638
k8s.io/helm v2.17.0+incompatible
3739
k8s.io/klog v1.0.0
38-
k8s.io/kubectl v0.20.4
39-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
40+
k8s.io/kubectl v0.21.7
41+
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
4042
sigs.k8s.io/yaml v1.2.0
4143
)
4244

@@ -45,7 +47,8 @@ replace github.com/fluxcd/helm-operator/pkg/install => ./pkg/install
4547

4648
// Transitive requirement from Helm: https://github.com/helm/helm/blob/v3.5.2/go.mod#L52-L53
4749
replace (
48-
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
50+
github.com/docker/distribution => github.com/docker/distribution v2.7.0-rc.0+incompatible
51+
4952
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
5053
)
5154

@@ -59,22 +62,30 @@ replace (
5962
// github.com/fluxcd/helm-operator
6063
// +-> github.com/fluxcd/[email protected]
6164
// +-> k8s.io/[email protected]+incompatible
62-
replace k8s.io/client-go => k8s.io/client-go v0.20.4
65+
replace k8s.io/client-go => k8s.io/client-go v0.21.7
6366

6467
// Force upgrade because of a transitive downgrade.
6568
// github.com/fluxcd/flux
6669
// +-> github.com/fluxcd/[email protected]
6770
// +-> helm.sh/helm/[email protected]
6871
// +-> helm.sh/[email protected]
6972
replace (
70-
helm.sh/helm/v3 => helm.sh/helm/v3 v3.5.4
73+
helm.sh/helm/v3 => helm.sh/helm/v3 v3.6.3
7174
k8s.io/helm => k8s.io/helm v2.17.0+incompatible
7275
)
7376

74-
// Force upgrade because of transitive downgrade.
75-
// runc >=1.0.0-RC10 patches CVE-2019-19921.
76-
// runc >=1.0.0-RC7 patches CVE-2019-5736.
77+
// Pin specific runc following example of source-controller upstream:
78+
// https://github.com/fluxcd/source-controller/blob/59dc602b2d0a5b0d4625a4a848303fa2d2117e84/go.mod#L62-L77
7779
// github.com/fluxcd/helm-operator
78-
// +-> helm.sh/helm/[email protected]
79-
// +-> github.com/opencontainers/[email protected]
80-
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc10
80+
// +-> helm.sh/helm/[email protected]
81+
// +-> github.com/opencontainers/[email protected]
82+
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.2
83+
84+
// Mitigating: GHSA-5j5w-g665-5m35
85+
replace github.com/containerd/containerd => github.com/containerd/containerd v1.4.12
86+
87+
// Mitigating: GHSA-77vh-xpmg-72qh
88+
replace github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2
89+
90+
// Mitigating: CVE-2021-41092
91+
replace github.com/docker/cli => github.com/docker/cli v20.10.9+incompatible

0 commit comments

Comments
 (0)