Skip to content

Commit a778193

Browse files
Merge pull request redhat-appstudio#817 from tisutisu/update_quay
chore: Update dependent quay package to use latest
2 parents 34ac9b0 + 3bce111 commit a778193

File tree

5 files changed

+71
-19
lines changed

5 files changed

+71
-19
lines changed

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
require (
2525
github.com/CycloneDX/cyclonedx-go v0.7.1
2626
github.com/google/go-containerregistry v0.15.2
27-
github.com/redhat-appstudio/image-controller v0.0.0-20230619094421-a6d78d062948
27+
github.com/redhat-appstudio/image-controller v0.0.0-20230816131033-9e9021e17ad9
2828
github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436
2929
github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172
3030
go.uber.org/zap v1.24.0
@@ -81,7 +81,6 @@ require (
8181
github.com/prometheus/common v0.42.0 // indirect
8282
github.com/prometheus/procfs v0.10.1 // indirect
8383
github.com/prometheus/statsd_exporter v0.21.0 // indirect
84-
github.com/rogpeppe/go-internal v1.11.0 // indirect
8584
github.com/sirupsen/logrus v1.9.0 // indirect
8685
github.com/spf13/pflag v1.0.5 // indirect
8786
github.com/vbatts/tar-split v0.11.3 // indirect

go.sum

+2-3
Original file line numberDiff line numberDiff line change
@@ -462,16 +462,15 @@ github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+Pymzi
462462
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
463463
github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8=
464464
github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ=
465-
github.com/redhat-appstudio/image-controller v0.0.0-20230619094421-a6d78d062948 h1:jDmXnFVxmbhqPDk5LFBh+QTLR7n0nqwQodc00OtTi3g=
466-
github.com/redhat-appstudio/image-controller v0.0.0-20230619094421-a6d78d062948/go.mod h1:5jVUQSgHYjzfZtWC7aJv2zhP7tyH6k47FdLGC2FaA4M=
465+
github.com/redhat-appstudio/image-controller v0.0.0-20230816131033-9e9021e17ad9 h1:RJEMaCPWkRLqVYIZTVkGrwteNt1gJuKcVW1tWNGD4qE=
466+
github.com/redhat-appstudio/image-controller v0.0.0-20230816131033-9e9021e17ad9/go.mod h1:Ta5j95tfMJZpoU/MtEuJJ5RUk3jX3ZzyDIs3FFyquNw=
467467
github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436 h1:6XYknDslXDSVpNqEKnI+gKj3Uu4afK2S+IIH3KogX1E=
468468
github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436/go.mod h1:QlcxNg0q63QFGr9ceI3dH7a7vO6gGh+2TJrbTiMf9DE=
469469
github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172 h1:Zibq2RBTzcoDgZcTfM5k2o1qrKuix3YPtYQ/NuP039Y=
470470
github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172/go.mod h1:FGHbzLSIpXZKFVKKQr1sSrgN3+wBpJw0wTTjTRNNm+k=
471471
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
472472
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
473473
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
474-
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
475474
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
476475
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
477476
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=

pkg/reconciler/jbsconfig/jbsconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ func (r *ReconcilerJBSConfig) generateImageRepository(log logr.Logger, component
777777
return nil, nil, err
778778
}
779779

780-
err = r.quayClient.AddWritePermissionsToRobotAccount(r.quayOrgName, repo.Name, robotAccountName)
780+
err = r.quayClient.AddPermissionsForRepositoryToRobotAccount(r.quayOrgName, repo.Name, robotAccountName, true)
781781
if err != nil {
782782
log.Error(err, fmt.Sprintf("failed to add permissions to robot account %s for image repository %s and organisation %s", robotAccountName, imageRepositoryName, r.quayOrgName))
783783
return nil, nil, err

vendor/github.com/redhat-appstudio/image-controller/pkg/quay/quay.go

+65-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -258,17 +258,15 @@ github.com/prometheus/procfs/internal/util
258258
## explicit; go 1.13
259259
github.com/prometheus/statsd_exporter/pkg/mapper
260260
github.com/prometheus/statsd_exporter/pkg/mapper/fsm
261-
# github.com/redhat-appstudio/image-controller v0.0.0-20230619094421-a6d78d062948
262-
## explicit; go 1.18
261+
# github.com/redhat-appstudio/image-controller v0.0.0-20230816131033-9e9021e17ad9
262+
## explicit; go 1.19
263263
github.com/redhat-appstudio/image-controller/pkg/quay
264264
# github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436
265265
## explicit; go 1.20
266266
github.com/redhat-appstudio/remote-secret/api/v1beta1
267267
# github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172
268268
## explicit; go 1.20
269269
github.com/redhat-appstudio/service-provider-integration-operator/api/v1beta1
270-
# github.com/rogpeppe/go-internal v1.11.0
271-
## explicit; go 1.19
272270
# github.com/sirupsen/logrus v1.9.0
273271
## explicit; go 1.13
274272
github.com/sirupsen/logrus

0 commit comments

Comments
 (0)