Skip to content

Commit

Permalink
chore: update image-spec and dist spec to 1.1.0 (#2255)
Browse files Browse the repository at this point in the history 
BREAKING CHANGE: the dist spec version in the config files needs to be bumped to 1.1.0
in order for the config verification to pass without warnings.

Also fix 1 dependabot alert for helm.

Signed-off-by: Andrei Aaron <[email protected]>
  • Loading branch information
@andaaron
andaaron authored Feb 20, 2024
1 parent 960686b commit 4e5db84
Show file tree
Hide file tree
Showing 74 changed files with 117 additions and 117 deletions.
6 changes: 3 additions & 3 deletions THIRD-PARTY-LICENSES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ github.com/nozzle/throttler|https://github.com/nozzle/throttler/blob/2ea98225148
github.com/oklog/ulid|https://github.com/oklog/ulid/blob/v1.3.1/LICENSE|Apache-2.0
github.com/oleiade/reflections|https://github.com/oleiade/reflections/blob/v1.0.1/LICENSE|MIT
github.com/olekukonko/tablewriter|https://github.com/olekukonko/tablewriter/blob/v0.0.5/LICENSE.md|MIT
github.com/opencontainers/distribution-spec/specs-go|https://github.com/opencontainers/distribution-spec/blob/067a0f5b0e25/specs-go/LICENSE|Apache-2.0
github.com/opencontainers/distribution-spec/specs-go|https://github.com/opencontainers/distribution-spec/blob/0f98d91a0afe/specs-go/LICENSE|Apache-2.0
github.com/opencontainers/go-digest|https://github.com/opencontainers/go-digest/blob/v1.0.0/LICENSE|Apache-2.0
github.com/opencontainers/image-spec/specs-go|https://github.com/opencontainers/image-spec/blob/v1.1.0-rc6/LICENSE|Apache-2.0
github.com/opencontainers/image-spec|https://github.com/opencontainers/image-spec/blob/v1.1.0-rc6/LICENSE|Apache-2.0
github.com/opencontainers/image-spec/specs-go|https://github.com/opencontainers/image-spec/blob/v1.1.0/LICENSE|Apache-2.0
github.com/opencontainers/image-spec|https://github.com/opencontainers/image-spec/blob/v1.1.0/LICENSE|Apache-2.0
github.com/opencontainers/runtime-spec/specs-go|https://github.com/opencontainers/runtime-spec/blob/v1.1.0/LICENSE|Apache-2.0
github.com/opencontainers/selinux|https://github.com/opencontainers/selinux/blob/v1.11.0/LICENSE|Apache-2.0
github.com/opentracing/opentracing-go|https://github.com/opentracing/opentracing-go/blob/v1.2.0/LICENSE|Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion examples/config-all-remote.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"dedupe": true,
"remoteCache": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-allextensions.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-anonymous-authz.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-bearer-auth.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-bench.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-boltdb.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-commit.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"commit": true
Expand Down
2 changes: 1 addition & 1 deletion examples/config-conformance.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-cve.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-dynamodb.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-example.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-example.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distspecversion: 1.1.0-dev
distspecversion: 1.1.0
http:
address: 127.0.0.1
auth:
Expand Down
2 changes: 1 addition & 1 deletion examples/config-gc-periodic.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-gc.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-ldap.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-lint.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-metrics-authz.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-metrics.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-minimal.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-multiple-cve.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-multiple.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-openid.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true
Expand Down
2 changes: 1 addition & 1 deletion examples/config-policy.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-popular-registries.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/data"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-ratelimit.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-retention.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-s3.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-scheduler.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-scrub.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-search.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-sync-cloud-storage.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"dedupe": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/config-sync.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-test.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-tls.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/config-ui.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot"
},
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/nmcclain/ldap v0.0.0-20210720162743-7f8d1e44eeba
github.com/olekukonko/tablewriter v0.0.5
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc6
github.com/opencontainers/image-spec v1.1.0
github.com/oras-project/artifacts-spec v1.0.0-rc.2
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/prometheus/client_golang v1.18.0
Expand Down Expand Up @@ -56,7 +56,7 @@ require (
github.com/gorilla/sessions v1.2.2
github.com/migueleliasweb/go-github-mock v0.0.22
github.com/notaryproject/notation-go v1.1.0
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe
github.com/project-zot/mockoidc v0.0.0-20230307111146-f607b4b5fb97
github.com/sigstore/cosign/v2 v2.2.3
github.com/swaggo/http-swagger v1.3.4
Expand Down Expand Up @@ -220,7 +220,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
helm.sh/helm/v3 v3.14.0 // indirect
helm.sh/helm/v3 v3.14.1 // indirect
k8s.io/apiextensions-apiserver v0.29.0 // indirect
k8s.io/apiserver v0.29.0 // indirect
k8s.io/cli-runtime v0.29.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1240,12 +1240,12 @@ github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/open-policy-agent/opa v0.61.0 h1:nhncQ2CAYtQTV/SMBhDDPsCpCQsUW+zO/1j+T5V7oZg=
github.com/open-policy-agent/opa v0.61.0/go.mod h1:7OUuzJnsS9yHf8lw0ApfcbrnaRG1EkN3J2fuuqi4G/E=
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25 h1:DpApB9YKcjGF1Lc8FmEAD5Xa1LRhVftJGgpe3+47Vc0=
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25/go.mod h1:uLvbyisMXc6uWXBmKrPegq9igec91coS/kGM2sHL660=
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe h1:Gu7JiAGBfMlKG7WsuAqqRBJjDGwEg0RU2NvX1za2Pk4=
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20240201174943-0f98d91a0afe/go.mod h1:Va0IMqkjv62YSEytL4sgxrkiD9IzU0T0bX/ZZEtMnSQ=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0-rc6 h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
github.com/opencontainers/image-spec v1.1.0-rc6/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
Expand Down Expand Up @@ -2236,8 +2236,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
helm.sh/helm/v3 v3.14.0 h1:TaZIH6uOchn7L27ptwnnuHJiFrT/BsD4dFdp/HLT2nM=
helm.sh/helm/v3 v3.14.0/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424=
helm.sh/helm/v3 v3.14.1 h1:4AwRLx+wfzlPtvrsbDmWP5PUokGmf9/nAmEdk21vae8=
helm.sh/helm/v3 v3.14.1/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/routes.go
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @title Open Container Initiative Distribution Specification
// @version v1.1.0-dev
// @version v1.1.0
// @description APIs for Open Container Initiative Distribution Specification

// @license.name Apache 2.0
Expand Down
Loading

0 comments on commit 4e5db84

Please sign in to comment.