Skip to content

Commit bb5c153

Browse files
stefanprodanstefanprodan
authored
Merge pull request #665 from fluxcd/go-yaml-v3.0.0
Update go-yaml to v3.0.0
2 parents a31488c + 2738c29 commit bb5c153

File tree

10 files changed

+55
-79
lines changed

10 files changed

+55
-79
lines changed

‎.github/workflows/cifuzz.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name: CIFuzz
1+
name: fuzz
22
on:
33
pull_request:
44
branches:
55
- main
66

77
permissions:
88
contents: read # for actions/checkout to fetch code
9-
9+
1010
jobs:
11-
Fuzzing:
11+
smoketest:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout

‎.github/workflows/e2e.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818
- name: Setup QEMU
1919
uses: docker/setup-qemu-action@v1
2020
with:
@@ -23,22 +23,22 @@ jobs:
2323
id: buildx
2424
uses: docker/setup-buildx-action@v1
2525
- name: Restore Go cache
26-
uses: actions/cache@v1
26+
uses: actions/cache@v3
2727
with:
2828
path: ~/go/pkg/mod
2929
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
3030
restore-keys: |
3131
${{ runner.os }}-go-
3232
- name: Cache Docker layers
33-
uses: actions/cache@v2
33+
uses: actions/cache@v3
3434
id: cache
3535
with:
3636
path: /tmp/.buildx-cache
3737
key: ${{ runner.os }}-buildx-ghcache-${{ github.sha }}
3838
restore-keys: |
3939
${{ runner.os }}-buildx-ghcache-
4040
- name: Setup Go
41-
uses: actions/setup-go@v2
41+
uses: actions/setup-go@v3
4242
with:
4343
go-version: 1.17.x
4444
- name: Setup Kubernetes

‎.github/workflows/nightly.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Setup QEMU
1919
uses: docker/setup-qemu-action@v1
2020
with:
2121
platforms: all
2222
- name: Setup Docker Buildx
2323
id: buildx
24-
uses: docker/setup-buildx-action@v1
24+
uses: docker/setup-buildx-action@v2
2525
with:
2626
buildkitd-flags: "--debug"
2727
- name: Build multi-arch container image
28-
uses: docker/build-push-action@v2
28+
uses: docker/build-push-action@v3
2929
with:
3030
push: false
3131
builder: ${{ steps.buildx.outputs.name }}

‎.github/workflows/rebase.yml

-26
This file was deleted.

‎.github/workflows/release.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build-push:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626
- name: Setup Kustomize
2727
uses: fluxcd/pkg/actions/kustomize@main
2828
- name: Prepare
@@ -35,32 +35,32 @@ jobs:
3535
echo ::set-output name=BUILD_DATE::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
3636
echo ::set-output name=VERSION::${VERSION}
3737
- name: Setup QEMU
38-
uses: docker/setup-qemu-action@v1
38+
uses: docker/setup-qemu-action@v2
3939
- name: Setup Docker Buildx
4040
id: buildx
41-
uses: docker/setup-buildx-action@v1
41+
uses: docker/setup-buildx-action@v2
4242
- name: Login to GitHub Container Registry
43-
uses: docker/login-action@v1
43+
uses: docker/login-action@v2
4444
with:
4545
registry: ghcr.io
4646
username: fluxcdbot
4747
password: ${{ secrets.GHCR_TOKEN }}
4848
- name: Login to Docker Hub
49-
uses: docker/login-action@v1
49+
uses: docker/login-action@v2
5050
with:
5151
username: fluxcdbot
5252
password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
5353
- name: Generate images meta
5454
id: meta
55-
uses: docker/metadata-action@v3
55+
uses: docker/metadata-action@v4
5656
with:
5757
images: |
5858
fluxcd/${{ env.CONTROLLER }}
5959
ghcr.io/fluxcd/${{ env.CONTROLLER }}
6060
tags: |
6161
type=raw,value=${{ steps.prep.outputs.VERSION }}
6262
- name: Publish images
63-
uses: docker/build-push-action@v2
63+
uses: docker/build-push-action@v3
6464
with:
6565
push: true
6666
builder: ${{ steps.buildx.outputs.name }}
@@ -92,7 +92,7 @@ jobs:
9292
- uses: anchore/sbom-action/download-syft@v0
9393
- name: Create release and SBOM
9494
if: startsWith(github.ref, 'refs/tags/v')
95-
uses: goreleaser/goreleaser-action@v2
95+
uses: goreleaser/goreleaser-action@v3
9696
with:
9797
version: latest
9898
args: release --release-notes=config/release/notes.md --rm-dist --skip-validate

‎.github/workflows/scan.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Scan
1+
name: scan
22

33
on:
44
push:
@@ -17,7 +17,7 @@ jobs:
1717
name: FOSSA
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- name: Run FOSSA scan and upload build data
2222
uses: fossa-contrib/fossa-action@v1
2323
with:
@@ -30,12 +30,12 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v2
33+
uses: actions/checkout@v3
3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@v1
35+
uses: github/codeql-action/init@v2
3636
with:
3737
languages: go
3838
- name: Autobuild
39-
uses: github/codeql-action/autobuild@v1
39+
uses: github/codeql-action/autobuild@v2
4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@v1
41+
uses: github/codeql-action/analyze@v2

‎api/go.mod

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ module github.com/fluxcd/kustomize-controller/api
33
go 1.17
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v0.4.0
7-
github.com/fluxcd/pkg/apis/meta v0.14.0
6+
github.com/fluxcd/pkg/apis/kustomize v0.4.1
7+
github.com/fluxcd/pkg/apis/meta v0.14.1
88
k8s.io/apiextensions-apiserver v0.24.0
99
k8s.io/apimachinery v0.24.0
1010
sigs.k8s.io/controller-runtime v0.11.2
1111
)
1212

13+
// Fix CVE-2022-28948
14+
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0
15+
1316
require (
1417
github.com/go-logr/logr v1.2.2 // indirect
1518
github.com/gogo/protobuf v1.3.2 // indirect

‎api/go.sum

+6-8
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
121121
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
122122
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
123123
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
124-
github.com/fluxcd/pkg/apis/kustomize v0.4.0 h1:6sCVlkwThr4TVimtxGkJFVO42IVfNEo5HvYodrrXkIQ=
125-
github.com/fluxcd/pkg/apis/kustomize v0.4.0/go.mod h1:/kGagX0D9MdwygeS13aGNu8TvH5dbpgp9UeEr/aod/I=
126-
github.com/fluxcd/pkg/apis/meta v0.14.0 h1:DFKFSBuIBsuPCgpI0ZpgD+j6xmVlwYy2taYED/UdHao=
127-
github.com/fluxcd/pkg/apis/meta v0.14.0/go.mod h1:VJ0EbWahihH6soFKGz8WdPDNMjh9Nw5sPgSrOa+bygA=
124+
github.com/fluxcd/pkg/apis/kustomize v0.4.1 h1:YgIF9TJ23pH66W/gYlEu+DeH1pU3tS4xYlRc5AQzk58=
125+
github.com/fluxcd/pkg/apis/kustomize v0.4.1/go.mod h1:U9rfSgDHaQd74PgPKt9DprtuzT+i1m18zlHxatq7c5Y=
126+
github.com/fluxcd/pkg/apis/meta v0.14.1 h1:lPDs9yV67DnwalHPb13bbnDkAatALfUiAMRHjUm4UBw=
127+
github.com/fluxcd/pkg/apis/meta v0.14.1/go.mod h1:1uJkTJGSZWrZxL5PFpx1IxGLrFmT1Cd0C2fFWrbv77I=
128128
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
129129
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
130130
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -878,10 +878,8 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
878878
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
879879
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
880880
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
881-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
882-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
883-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
884-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
881+
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
882+
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
885883
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
886884
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
887885
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎go.mod

+8-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ require (
2020
github.com/drone/envsubst v1.0.3
2121
github.com/fluxcd/kustomize-controller/api v0.25.0
2222
github.com/fluxcd/pkg/apis/acl v0.0.3
23-
github.com/fluxcd/pkg/apis/kustomize v0.4.0
24-
github.com/fluxcd/pkg/apis/meta v0.14.0
25-
github.com/fluxcd/pkg/kustomize v0.5.0
26-
github.com/fluxcd/pkg/runtime v0.16.0
27-
github.com/fluxcd/pkg/ssa v0.16.0
23+
github.com/fluxcd/pkg/apis/kustomize v0.4.1
24+
github.com/fluxcd/pkg/apis/meta v0.14.1
25+
github.com/fluxcd/pkg/kustomize v0.5.1
26+
github.com/fluxcd/pkg/runtime v0.16.1
27+
github.com/fluxcd/pkg/ssa v0.16.1
2828
github.com/fluxcd/pkg/testserver v0.2.0
2929
github.com/fluxcd/pkg/untar v0.1.0
3030
github.com/fluxcd/source-controller/api v0.24.4
@@ -61,6 +61,9 @@ replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.2
6161
// Fix CVE-2022-27191
6262
replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
6363

64+
// Fix CVE-2022-28948
65+
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0
66+
6467
require (
6568
cloud.google.com/go v0.100.2 // indirect
6669
cloud.google.com/go/compute v1.6.1 // indirect

‎go.sum

+12-14
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,16 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga
290290
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
291291
github.com/fluxcd/pkg/apis/acl v0.0.3 h1:Lw0ZHdpnO4G7Zy9KjrzwwBmDZQuy4qEjaU/RvA6k1lc=
292292
github.com/fluxcd/pkg/apis/acl v0.0.3/go.mod h1:XPts6lRJ9C9fIF9xVWofmQwftvhY25n1ps7W9xw0XLU=
293-
github.com/fluxcd/pkg/apis/kustomize v0.4.0 h1:6sCVlkwThr4TVimtxGkJFVO42IVfNEo5HvYodrrXkIQ=
294-
github.com/fluxcd/pkg/apis/kustomize v0.4.0/go.mod h1:/kGagX0D9MdwygeS13aGNu8TvH5dbpgp9UeEr/aod/I=
295-
github.com/fluxcd/pkg/apis/meta v0.14.0 h1:DFKFSBuIBsuPCgpI0ZpgD+j6xmVlwYy2taYED/UdHao=
296-
github.com/fluxcd/pkg/apis/meta v0.14.0/go.mod h1:VJ0EbWahihH6soFKGz8WdPDNMjh9Nw5sPgSrOa+bygA=
297-
github.com/fluxcd/pkg/kustomize v0.5.0 h1:u3y2a22hGxQ9fDgEexZmhrV45eZSaaqYoytepJqs2OI=
298-
github.com/fluxcd/pkg/kustomize v0.5.0/go.mod h1:tbU862ZHPunnV59RielyyxXUu6yvkrLsprlcS17IjHM=
299-
github.com/fluxcd/pkg/runtime v0.16.0 h1:ynzvkOedFFZHlsa47EE7XtxZe8qs8edhtmjVZBEWi1Y=
300-
github.com/fluxcd/pkg/runtime v0.16.0/go.mod h1:Iklg+r/Jnqc9cNf2NK+iaosvw49CxX07Pyn0r3zSg/o=
301-
github.com/fluxcd/pkg/ssa v0.16.0 h1:+pT9y7zJC/Zvf+XeZdqO5j0KnD+z70uHT1vX5rLW1iw=
302-
github.com/fluxcd/pkg/ssa v0.16.0/go.mod h1:bovqBjOVP2DbBKKukSsPs15+N4BV2rVOJU7qkAKyinI=
293+
github.com/fluxcd/pkg/apis/kustomize v0.4.1 h1:YgIF9TJ23pH66W/gYlEu+DeH1pU3tS4xYlRc5AQzk58=
294+
github.com/fluxcd/pkg/apis/kustomize v0.4.1/go.mod h1:U9rfSgDHaQd74PgPKt9DprtuzT+i1m18zlHxatq7c5Y=
295+
github.com/fluxcd/pkg/apis/meta v0.14.1 h1:lPDs9yV67DnwalHPb13bbnDkAatALfUiAMRHjUm4UBw=
296+
github.com/fluxcd/pkg/apis/meta v0.14.1/go.mod h1:1uJkTJGSZWrZxL5PFpx1IxGLrFmT1Cd0C2fFWrbv77I=
297+
github.com/fluxcd/pkg/kustomize v0.5.1 h1:151Ih34ltxN2z1e2mA5AvQONyE6phc4es57oVK3+plU=
298+
github.com/fluxcd/pkg/kustomize v0.5.1/go.mod h1:58MFITy24bIbGI6cC3JkV/YpFQj648sVvgs0K1kraJw=
299+
github.com/fluxcd/pkg/runtime v0.16.1 h1:WU1vNZz4TAzmATQ/tl2zB/FX6GIUTgYeBn/G5RuTA2c=
300+
github.com/fluxcd/pkg/runtime v0.16.1/go.mod h1:cgVJkOXCg9OmrIUGklf/0UtV28MNzkuoBJhaEQICT6E=
301+
github.com/fluxcd/pkg/ssa v0.16.1 h1:hWXMtDhiAPRPHpHiQ5NzVjqIDhOfyzWmc2zA49Wxw7E=
302+
github.com/fluxcd/pkg/ssa v0.16.1/go.mod h1:rLqpc2CDtyZhRIMKHDRJoMHXj0MgQBpg5134zk+ARHM=
303303
github.com/fluxcd/pkg/testserver v0.2.0 h1:Mj0TapmKaywI6Fi5wvt1LAZpakUHmtzWQpJNKQ0Krt4=
304304
github.com/fluxcd/pkg/testserver v0.2.0/go.mod h1:bgjjydkXsZTeFzjz9Cr4heGANr41uTB1Aj1Q5qzuYVk=
305305
github.com/fluxcd/pkg/untar v0.1.0 h1:k97V/xV5hFrAkIkVPuv5AVhyxh1ZzzAKba/lbDfGo6o=
@@ -1417,10 +1417,8 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
14171417
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
14181418
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
14191419
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
1420-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1421-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1422-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
1423-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1420+
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
1421+
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14241422
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
14251423
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
14261424
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=

0 commit comments

Comments
 (0)