Skip to content

Update for distribution spec 1.0#5676

Merged
fuweid merged 2 commits intocontainerd:mainfrom
dmcgowan:update-for-distribution-spec-1.0
Jul 9, 2021
Merged

Update for distribution spec 1.0#5676
fuweid merged 2 commits intocontainerd:mainfrom
dmcgowan:update-for-distribution-spec-1.0

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Jul 2, 2021 •
edited
Loading

Clarifies in stronger language which registries are supported by containerd now that OCI distribution specification has reached 1.0 and has compliance testing.

Adds a "workaround" for registries which do not properly implement the "/v2" prefix as defined by the specification. This helps some Harbor users which are using non-compliant mirror endpoints.

Closes #5518

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 2, 2021

Build succeeded.

@dmcgowan dmcgowan force-pushed the update-for-distribution-spec-1.0 branch from ef54c09 to 69dff5c Compare July 2, 2021 01:03
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 2, 2021

Build succeeded.

@dmcgowan dmcgowan mentioned this pull request Jul 2, 2021
Closed
ktock
ktock approved these changes Jul 2, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ktock ktock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ktock
Copy link
Copy Markdown
Member

ktock commented Jul 2, 2021

cc @MaxRink

@ktock
Copy link
Copy Markdown
Member

ktock commented Jul 2, 2021

/retest

mikebrow
mikebrow reviewed Jul 2, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see question / comment

Comment thread remotes/docker/config/hosts_test.go Outdated
@dmcgowan
Add support for registry host path override
a7ad6b3 
Adds support for mirrors which are non-compliant with the
OCI distribution specification but have previously mirrored
content with a namespace prefix after the API root `/v2`.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan force-pushed the update-for-distribution-spec-1.0 branch from 69dff5c to a7ad6b3 Compare July 2, 2021 16:49
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 2, 2021

Build succeeded.

mikebrow
mikebrow approved these changes Jul 2, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jul 3, 2021

/retest

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jul 3, 2021 

[sig-node] ResourceMetricsAPI [NodeFeature:ResourceMetrics]
_output/local/go/src/k8s.io/kubernetes/test/e2e_node/framework.go:23
  when querying /resource/metrics
  _output/local/go/src/k8s.io/kubernetes/test/e2e_node/resource_metrics_test.go:45
    should report resource usage through the resource metrics api [It]
    _output/local/go/src/k8s.io/kubernetes/test/e2e_node/resource_metrics_test.go:66
    Timed out after 60.000s.
      
    Expected
        <string>: KubeletMetrics
    to match keys: {
    [."container_start_time_seconds"[resource-metrics-7721::stats-busybox-0::busybox-container]:
    	Expected
    	    <string>: Sample
    	to match fields: {
    	.Value:
    		Expected
    		    <model.SampleValue>: 1.625262691484108e+09
    		to be >=
    		    <int64>: 1625262653628039599
    	.Timestamp:
    		Expected
    		    <time.Time>: 1970-01-01T00:00:00Z
    		to be >=
    		    <time.Time>: 2021-07-02T21:50:53.628040868Z
    	}
    	, ."container_start_time_seconds"[resource-metrics-7721::stats-busybox-1::busybox-container]:
    	Expected
    	    <string>: Sample
    	to match fields: {
    	.Value:
    		Expected
    		    <model.SampleValue>: 1.625262691536568e+09
    		to be >=
    		    <int64>: 1625262653628042725
    	.Timestamp:
    		Expected
    		    <time.Time>: 1970-01-01T00:00:00Z
    		to be >=
    		    <time.Time>: 2021-07-02T21:50:53.628043652Z
    	}
    	]
    }
    
    _output/local/go/src/k8s.io/kubernetes/test/e2e_node/resource_metrics_test.go:107

looks like kubelet or cadvisor issue cc @dims

@nicoche nicoche mentioned this pull request Jul 4, 2021
Closed
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Jul 5, 2021

/retest

@kzys
Copy link
Copy Markdown
Member

kzys commented Jul 6, 2021

/retest

estesp
estesp approved these changes Jul 6, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jul 9, 2021

/retest

@fuweid fuweid merged commit 71c1dc6 into containerd:main Jul 9, 2021
@dmcgowan dmcgowan deleted the update-for-distribution-spec-1.0 branch April 20, 2024 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@mxpv mxpv mxpv approved these changes

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@mikebrow mikebrow mikebrow approved these changes

@fuweid fuweid fuweid approved these changes

@ktock ktock ktock approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[regression] config_path less powerfull than registry.mirrors

8 participants

@dmcgowan @ktock @fuweid @AkihiroSuda @kzys @mxpv @estesp @mikebrow