Skip to content

Commit

Permalink
Append image pull secrets instead of replace (#1509)
Browse files Browse the repository at this point in the history
Co-authored-by: Tamal Saha <tamal@appscode.com>
Signed-off-by: hmsayem <hmsayem@appscode.com>
  • Loading branch information
hmsayem and tamalsaha authored Mar 18, 2023
1 parent d342809 commit 5fb5bda
Show file tree
Hide file tree
Showing 106 changed files with 6,130 additions and 3,040 deletions.
27 changes: 15 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ require (
gomodules.xyz/x v0.0.14
k8s.io/api v0.25.1
k8s.io/apiextensions-apiserver v0.25.1
k8s.io/apimachinery v0.25.1
k8s.io/apimachinery v0.25.3
k8s.io/apiserver v0.25.1
k8s.io/client-go v0.25.1
k8s.io/klog/v2 v2.80.1
k8s.io/kube-aggregator v0.25.1
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
kmodules.xyz/client-go v0.25.14
kmodules.xyz/client-go v0.25.19
kmodules.xyz/constants v0.0.0-20220317041001-545c1e31a70a
kmodules.xyz/csi-utils v0.25.4
kmodules.xyz/custom-resources v0.25.1
Expand All @@ -44,11 +44,13 @@ require (
kmodules.xyz/openshift v0.25.0
kmodules.xyz/prober v0.25.0
kmodules.xyz/webhook-runtime v0.25.0
stash.appscode.dev/apimachinery v0.27.0
stash.appscode.dev/apimachinery v0.27.1-0.20230318125832-292f37f44ac4
)

require (
cloud.google.com/go v0.99.0 // indirect
cloud.google.com/go/compute v1.13.0 // indirect
cloud.google.com/go/compute/metadata v0.2.2 // indirect
cloud.google.com/go/storage v1.27.0 // indirect
github.com/Azure/azure-sdk-for-go v55.0.0+incompatible // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
Expand Down Expand Up @@ -97,7 +99,8 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
Expand Down Expand Up @@ -140,7 +143,7 @@ require (
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
go.opencensus.io v0.23.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
Expand All @@ -159,12 +162,12 @@ require (
gocloud.dev v0.22.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gomodules.xyz/jsonpath v0.0.2 // indirect
Expand All @@ -173,10 +176,10 @@ require (
gomodules.xyz/sets v0.2.1 // indirect
gomodules.xyz/sync v0.1.0 // indirect
gomodules.xyz/wait v0.2.0 // indirect
google.golang.org/api v0.61.0 // indirect
google.golang.org/api v0.103.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.47.0 // indirect
google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
Expand Down
168 changes: 31 additions & 137 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/executor/sidecar.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (e *Sidecar) Ensure() (runtime.Object, kutil.VerbType, error) {
}
}

e.Workload.Spec.Template.Spec.ImagePullSecrets = e.ImagePullSecrets
e.Workload.Spec.Template.Spec.ImagePullSecrets = core_util.UpsertImagePullSecrets(e.Workload.Spec.Template.Spec.ImagePullSecrets, e.ImagePullSecrets...)

if e.Workload.Spec.Template.Annotations == nil {
e.Workload.Spec.Template.Annotations = map[string]string{}
Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions vendor/cloud.google.com/go/compute/internal/version.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/CHANGES.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

202 changes: 202 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5fb5bda

Please sign in to comment.