github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70253 from dekkagaijin/master 

always allow unimportant legacy root paths
pull/58/head
k8s-ci-robot 2018-10-26 12:22:29 -07:00 committed by GitHub
parent c23e94a7ff 2a585d3fc7
commit c56dcddbe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/metadata-concealment/VERSION
View File

@ -1 +1 @@
1.1
1.1.1

4
test/images/metadata-concealment/check_metadata_concealment.go
View File

@ -32,6 +32,8 @@ var (
"http://metadata.google.internal",
"http://169.254.169.254/",
"http://metadata.google.internal/",
"http://metadata.google.internal/0.1",
"http://metadata.google.internal/0.1/",
"http://metadata.google.internal/computeMetadata",
"http://metadata.google.internal/computeMetadata/v1",
// Allowed API versions.
@ -44,8 +46,6 @@ var (
}
legacySuccessEndpoints = []string{
// Discovery
"http://metadata.google.internal/0.1",
"http://metadata.google.internal/0.1/",
"http://metadata.google.internal/0.1/meta-data",
"http://metadata.google.internal/computeMetadata/v1beta1",
// Allowed API versions.

2
test/utils/image/manifest.go
View File

@ -86,7 +86,7 @@ var (
APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.10"}
AppArmorLoader = ImageConfig{e2eRegistry, "apparmor-loader", "1.0"}
BusyBox = ImageConfig{dockerLibraryRegistry, "busybox", "1.29"}
CheckMetadataConcealment = ImageConfig{e2eRegistry, "metadata-concealment", "1.1"}
CheckMetadataConcealment = ImageConfig{e2eRegistry, "metadata-concealment", "1.1.1"}
CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0"}
Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.1"}
EchoServer = ImageConfig{e2eRegistry, "echoserver", "2.2"}