Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kubernetes packages to v1.20.4 #857

Merged
merged 3 commits into from
Mar 17, 2021
Merged

Update Kubernetes packages to v1.20.4 #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2792835
Update Kubernetes packages to v1.20.4
stefanprodan Mar 17, 2021
a5ea658
Update Alpine to v3.13
stefanprodan Mar 17, 2021
e9c3518
ci: Merge FOSSA and CodeQL workflows
stefanprodan Mar 17, 2021
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
67 changes: 0 additions & 67 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/fossa.yml
View file
Open in desktop

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: scan

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
schedule:
- cron: '18 10 * * 3'

jobs:
fossa:
name: FOSSA
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run FOSSA scan and upload build data
uses: fossa-contrib/fossa-action@v1
with:
# FOSSA Push-Only API Token
fossa-api-key: 5ee8bf422db1471e0bcf2bcb289185de
github-token: ${{ github.token }}

codeql:
name: CodeQL
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: go
- name: Autobuild
uses: github/codeql-action/autobuild@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN CGO_ENABLED=0 go build \
-ldflags "-s -w -X github.com/fluxcd/flagger/pkg/version.REVISION=${REVISON}" \
-a -o flagger ./cmd/flagger

FROM alpine:3.12
FROM alpine:3.13

RUN apk --no-cache add ca-certificates

Expand Down
16 changes: 8 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/fluxcd/flagger

go 1.14
go 1.15

require (
github.com/Masterminds/semver/v3 v3.0.3
github.com/aws/aws-sdk-go v1.36.20
github.com/aws/aws-sdk-go v1.37.32
github.com/davecgh/go-spew v1.1.1
github.com/go-logr/zapr v0.3.0
github.com/google/go-cmp v0.5.2
github.com/prometheus/client_golang v1.5.1
github.com/stretchr/testify v1.6.1
github.com/prometheus/client_golang v1.9.0
github.com/stretchr/testify v1.7.0
go.uber.org/zap v1.14.1
golang.org/x/tools v0.1.0 // indirect
gopkg.in/h2non/gock.v1 v1.0.15
k8s.io/api v0.20.1
k8s.io/apimachinery v0.20.1
k8s.io/client-go v0.20.1
k8s.io/code-generator v0.20.1
k8s.io/api v0.20.4
k8s.io/apimachinery v0.20.4
k8s.io/client-go v0.20.4
k8s.io/code-generator v0.20.4
k8s.io/klog/v2 v2.4.0
)
Loading