Skip to content

Commit c8a1165

Browse files
authored
Merge pull request #857 from fluxcd/update-deps-k8s
Update Kubernetes packages to v1.20.4
2 parents 16867db + e9c3518 commit c8a1165

File tree

6 files changed

+271
-167
lines changed

6 files changed

+271
-167
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/workflows/fossa.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/scan.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: scan
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
schedule:
9+
- cron: '18 10 * * 3'
10+
11+
jobs:
12+
fossa:
13+
name: FOSSA
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Run FOSSA scan and upload build data
18+
uses: fossa-contrib/fossa-action@v1
19+
with:
20+
# FOSSA Push-Only API Token
21+
fossa-api-key: 5ee8bf422db1471e0bcf2bcb289185de
22+
github-token: ${{ github.token }}
23+
24+
codeql:
25+
name: CodeQL
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: Checkout repository
29+
uses: actions/checkout@v2
30+
- name: Initialize CodeQL
31+
uses: github/codeql-action/init@v1
32+
with:
33+
languages: go
34+
- name: Autobuild
35+
uses: github/codeql-action/autobuild@v1
36+
- name: Perform CodeQL Analysis
37+
uses: github/codeql-action/analyze@v1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN CGO_ENABLED=0 go build \
2121
-ldflags "-s -w -X github.com/fluxcd/flagger/pkg/version.REVISION=${REVISON}" \
2222
-a -o flagger ./cmd/flagger
2323

24-
FROM alpine:3.12
24+
FROM alpine:3.13
2525

2626
RUN apk --no-cache add ca-certificates
2727

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module github.com/fluxcd/flagger
22

3-
go 1.14
3+
go 1.15
44

55
require (
66
github.com/Masterminds/semver/v3 v3.0.3
7-
github.com/aws/aws-sdk-go v1.36.20
7+
github.com/aws/aws-sdk-go v1.37.32
88
github.com/davecgh/go-spew v1.1.1
99
github.com/go-logr/zapr v0.3.0
1010
github.com/google/go-cmp v0.5.2
11-
github.com/prometheus/client_golang v1.5.1
12-
github.com/stretchr/testify v1.6.1
11+
github.com/prometheus/client_golang v1.9.0
12+
github.com/stretchr/testify v1.7.0
1313
go.uber.org/zap v1.14.1
1414
golang.org/x/tools v0.1.0 // indirect
1515
gopkg.in/h2non/gock.v1 v1.0.15
16-
k8s.io/api v0.20.1
17-
k8s.io/apimachinery v0.20.1
18-
k8s.io/client-go v0.20.1
19-
k8s.io/code-generator v0.20.1
16+
k8s.io/api v0.20.4
17+
k8s.io/apimachinery v0.20.4
18+
k8s.io/client-go v0.20.4
19+
k8s.io/code-generator v0.20.4
2020
k8s.io/klog/v2 v2.4.0
2121
)

0 commit comments

Comments
 (0)