Skip to content
This repository was archived by the owner on Apr 10, 2024. It is now read-only.

Commit 8ddbcfd

Browse files
committed
Merge pull request #1 from sans-cpe/security/Golang-to-1.19
Update Go and dependencies
2 parents bdf0891 + eced6e5 commit 8ddbcfd

9 files changed

Lines changed: 301 additions & 207 deletions

File tree

.travis.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
language: go
22

33
go:
4-
- 1.13
4+
- 1.19
55

66
services:
7-
- docker
7+
- docker
88

99
env:
10-
- GO111MODULE=on
10+
- GO111MODULE=on
1111

1212
install: true
1313

1414
stages:
15-
- test
16-
- build
15+
- test
16+
- build
1717

1818
jobs:
1919
include:
20-
- stage: test
21-
name: Test and Benchmark
22-
script: go test --bench --benchmem -v
23-
- stage: test
24-
name: Codecov Report
25-
script: go test -race -coverprofile=coverage.txt -covermode=atomic
26-
after_success: bash <(curl -s https://codecov.io/bash)
27-
- stage: build
28-
name: Quay.io
29-
if: tag IS present
30-
env:
31-
- IMAGE_NAME=quay.io/titansoft/imagepullsecret-patcher
32-
script:
33-
- docker login -u $QUAY_IO_ACCOUNT -p $QUAY_IO_TOKEN quay.io
34-
- docker build -t $IMAGE_NAME:$TRAVIS_TAG .
35-
- docker push $IMAGE_NAME:$TRAVIS_TAG
20+
- stage: test
21+
name: Test and Benchmark
22+
script: go test --bench --benchmem -v
23+
- stage: test
24+
name: Codecov Report
25+
script: go test -race -coverprofile=coverage.txt -covermode=atomic
26+
after_success: bash <(curl -s https://codecov.io/bash)
27+
- stage: build
28+
name: Quay.io
29+
if: tag IS present
30+
env:
31+
- IMAGE_NAME=quay.io/titansoft/imagepullsecret-patcher
32+
script:
33+
- docker login -u $QUAY_IO_ACCOUNT -p $QUAY_IO_TOKEN quay.io
34+
- docker build -t $IMAGE_NAME:$TRAVIS_TAG .
35+
- docker push $IMAGE_NAME:$TRAVIS_TAG
3636

3737
notifications:
3838
slack:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM golang:1.13 as builder
2+
FROM golang:1.19 as builder
33

44
ENV GO111MODULE=on
55

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Below is a table of available configurations:
3434

3535
And here are the annotations available:
3636

37-
| Annotation | Object | Description |
38-
| ------------------------------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------- |
37+
| Annotation | Object | Description |
38+
| ------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------------------------------ |
3939
| k8s.titansoft.com/imagepullsecret-patcher-exclude | namespace | If a namespace is set this annotation with "true", it will be excluded from processing by imagepullsecret-patcher. |
4040

4141
## Providing credentials
@@ -74,4 +74,4 @@ And it could be automated with a simple program like imagepullsecret-patcher.
7474

7575
Development Environment
7676

77-
- Go 1.13
77+
- Go 1.19

deploy-example/kubernetes-manifest/2_deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
serviceAccountName: imagepullsecret-patcher
2929
containers:
3030
- name: imagepullsecret-patcher
31-
image: "quay.io/titansoft/imagepullsecret-patcher:v0.14"
31+
image: "quay.io/titansoft/imagepullsecret-patcher:v0.15"
3232
env:
3333
- name: CONFIG_FORCE
3434
value: "true"
@@ -51,5 +51,5 @@ spec:
5151
memory: 30Mi
5252
volumes:
5353
- name: src-dockerconfigjson
54-
secret:
54+
secret:
5555
secretName: image-pull-secret-src

go.mod

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,49 @@
11
module github.com/titansoft-pte-ltd/imagepullsecret-patcher
22

3-
go 1.13
3+
go 1.19
44

55
require (
6-
github.com/sirupsen/logrus v1.4.2
7-
k8s.io/api v0.17.0
8-
k8s.io/apimachinery v0.17.0
9-
k8s.io/client-go v0.17.0
6+
github.com/sirupsen/logrus v1.9.0
7+
k8s.io/api v0.25.4
8+
k8s.io/apimachinery v0.25.4
9+
k8s.io/client-go v0.25.4
10+
)
11+
12+
require (
13+
github.com/davecgh/go-spew v1.1.1 // indirect
14+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
15+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
16+
github.com/go-logr/logr v1.2.3 // indirect
17+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
18+
github.com/go-openapi/jsonreference v0.20.0 // indirect
19+
github.com/go-openapi/swag v0.22.3 // indirect
20+
github.com/gogo/protobuf v1.3.2 // indirect
21+
github.com/golang/protobuf v1.5.2 // indirect
22+
github.com/google/gnostic v0.6.9 // indirect
23+
github.com/google/go-cmp v0.5.9 // indirect
24+
github.com/google/gofuzz v1.2.0 // indirect
25+
github.com/josharian/intern v1.0.0 // indirect
26+
github.com/json-iterator/go v1.1.12 // indirect
27+
github.com/mailru/easyjson v0.7.7 // indirect
28+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
29+
github.com/modern-go/reflect2 v1.0.2 // indirect
30+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
31+
github.com/pkg/errors v0.9.1 // indirect
32+
golang.org/x/net v0.2.0 // indirect
33+
golang.org/x/oauth2 v0.2.0 // indirect
34+
golang.org/x/sys v0.2.0 // indirect
35+
golang.org/x/term v0.2.0 // indirect
36+
golang.org/x/text v0.4.0 // indirect
37+
golang.org/x/time v0.2.0 // indirect
38+
google.golang.org/appengine v1.6.7 // indirect
39+
google.golang.org/protobuf v1.28.1 // indirect
40+
gopkg.in/inf.v0 v0.9.1 // indirect
41+
gopkg.in/yaml.v2 v2.4.0 // indirect
42+
gopkg.in/yaml.v3 v3.0.1 // indirect
43+
k8s.io/klog/v2 v2.80.1 // indirect
44+
k8s.io/kube-openapi v0.0.0-20221123214604-86e75ddd809a // indirect
45+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
46+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
47+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
48+
sigs.k8s.io/yaml v1.3.0 // indirect
1049
)

0 commit comments

Comments
 (0)