github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100753 from johnSchnake/newCustomRegistries

Browse Source 
Clean up and make more image handling consistent
This commit is contained in:
Kubernetes Prow Robot
2021-05-12 22:10:24 -07:00
committed by GitHub
parent 2076dabc38 0adf70b61b
commit 1c8f2c3d77
3 changed files with 172 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/dependencies.yaml
View File

@@ -30,7 +30,7 @@ dependencies:
version: "2.32"
refPaths:
- path: test/utils/image/manifest.go
match: configs\[Agnhost\] = Config{promoterE2eRegistry, "agnhost", "\d+\.\d+"}
match: configs\[Agnhost\] = Config{list\.PromoterE2eRegistry, "agnhost", "\d+\.\d+"}
# CNI plugins
- name: "cni"
@@ -151,7 +151,7 @@ dependencies:
- path: build/common.sh
match: __default_debian_iptables_version=
- path: test/utils/image/manifest.go
match: configs\[DebianIptables\] = Config{buildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"}
match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"}
- name: "k8s.gcr.io/go-runner: dependents"
version: v2.3.1-go1.16.4-buster.0
@@ -215,7 +215,7 @@ dependencies:
- path: test/utils/runners.go
match: k8s.gcr.io\/pause:\d+\.\d+
- path: test/utils/image/manifest.go
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+.\d+"}
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+.\d+"}
# metadata-concealment: bump this one first
- name: "metadata-concealment"
@@ -229,4 +229,4 @@ dependencies:
version: "1.6"
refPaths:
- path: test/utils/image/manifest.go
match: configs\[CheckMetadataConcealment\] = Config{promoterE2eRegistry, "metadata-concealment", "\d+\.\d+"}
match: configs\[CheckMetadataConcealment\] = Config{list\.PromoterE2eRegistry, "metadata-concealment", "\d+\.\d+"}