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

Commit

Permalink
Merge pull request #1 from sans-cpe/security/Golang-to-1.19
Browse files Browse the repository at this point in the history
Update Go and dependencies
  • Loading branch information
jselleck-sans committed Nov 29, 2022
2 parents bdf0891 + eced6e5 commit 4b13136
Show file tree
Hide file tree
Showing 8 changed files with 290 additions and 195 deletions.
42 changes: 21 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
language: go

go:
- 1.13
- 1.19

services:
- docker
- docker

env:
- GO111MODULE=on
- GO111MODULE=on

install: true

stages:
- test
- build
- test
- build

jobs:
include:
- stage: test
name: Test and Benchmark
script: go test --bench --benchmem -v
- stage: test
name: Codecov Report
script: go test -race -coverprofile=coverage.txt -covermode=atomic
after_success: bash <(curl -s https://codecov.io/bash)
- stage: build
name: Quay.io
if: tag IS present
env:
- IMAGE_NAME=quay.io/titansoft/imagepullsecret-patcher
script:
- docker login -u $QUAY_IO_ACCOUNT -p $QUAY_IO_TOKEN quay.io
- docker build -t $IMAGE_NAME:$TRAVIS_TAG .
- docker push $IMAGE_NAME:$TRAVIS_TAG
- stage: test
name: Test and Benchmark
script: go test --bench --benchmem -v
- stage: test
name: Codecov Report
script: go test -race -coverprofile=coverage.txt -covermode=atomic
after_success: bash <(curl -s https://codecov.io/bash)
- stage: build
name: Quay.io
if: tag IS present
env:
- IMAGE_NAME=quay.io/titansoft/imagepullsecret-patcher
script:
- docker login -u $QUAY_IO_ACCOUNT -p $QUAY_IO_TOKEN quay.io
- docker build -t $IMAGE_NAME:$TRAVIS_TAG .
- docker push $IMAGE_NAME:$TRAVIS_TAG

notifications:
slack:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM golang:1.13 as builder
FROM golang:1.19 as builder

ENV GO111MODULE=on

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Below is a table of available configurations:

And here are the annotations available:

| Annotation | Object | Description |
| ------------------------------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------- |
| Annotation | Object | Description |
| ------------------------------------------------- | --------- | ------------------------------------------------------------------------------------------------------------------ |
| 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. |

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

Development Environment

- Go 1.13
- Go 1.19
4 changes: 2 additions & 2 deletions deploy-example/kubernetes-manifest/2_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
serviceAccountName: imagepullsecret-patcher
containers:
- name: imagepullsecret-patcher
image: "quay.io/titansoft/imagepullsecret-patcher:v0.14"
image: "quay.io/titansoft/imagepullsecret-patcher:v0.15"
env:
- name: CONFIG_FORCE
value: "true"
Expand All @@ -51,5 +51,5 @@ spec:
memory: 30Mi
volumes:
- name: src-dockerconfigjson
secret:
secret:
secretName: image-pull-secret-src
49 changes: 44 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,49 @@
module github.com/titansoft-pte-ltd/imagepullsecret-patcher

go 1.13
go 1.19

require (
github.com/sirupsen/logrus v1.4.2
k8s.io/api v0.17.0
k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0
github.com/sirupsen/logrus v1.9.0
k8s.io/api v0.25.4
k8s.io/apimachinery v0.25.4
k8s.io/client-go v0.25.4
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
golang.org/x/net v0.2.0 // indirect
golang.org/x/oauth2 v0.2.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/term v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221123214604-86e75ddd809a // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 4b13136

Please sign in to comment.