mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #66940 from dims/fix-some-test-image-version-and-arch
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix some test images - update version and arch - gb-frontend and gb-redisslave are now *REALLY* multi-arch manifest lists. - Fix bad merge from #66066 for AdmissionWebhook Change-Id: I0995394d638ab00b0d1d30ad7099351b806dfd9d **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
		@@ -48,7 +48,7 @@ func (i *ImageConfig) SetVersion(version string) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var (
 | 
			
		||||
	AdmissionWebhook         = ImageConfig{e2eRegistry, "webhook", "1.12v1", true}
 | 
			
		||||
	AdmissionWebhook         = ImageConfig{e2eRegistry, "webhook", "1.12v1", false}
 | 
			
		||||
	APIServer                = ImageConfig{e2eRegistry, "sample-apiserver", "1.0", false}
 | 
			
		||||
	AppArmorLoader           = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false}
 | 
			
		||||
	BusyBox                  = ImageConfig{gcRegistry, "busybox", "1.24", false}
 | 
			
		||||
@@ -58,8 +58,8 @@ var (
 | 
			
		||||
	EchoServer               = ImageConfig{gcRegistry, "echoserver", "1.10", false}
 | 
			
		||||
	EntrypointTester         = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", false}
 | 
			
		||||
	Fakegitserver            = ImageConfig{e2eRegistry, "fakegitserver", "1.0", false}
 | 
			
		||||
	GBFrontend               = ImageConfig{sampleRegistry, "gb-frontend", "v5", false}
 | 
			
		||||
	GBRedisSlave             = ImageConfig{sampleRegistry, "gb-redisslave", "v2", false}
 | 
			
		||||
	GBFrontend               = ImageConfig{sampleRegistry, "gb-frontend", "v6", false}
 | 
			
		||||
	GBRedisSlave             = ImageConfig{sampleRegistry, "gb-redisslave", "v3", false}
 | 
			
		||||
	Hostexec                 = ImageConfig{e2eRegistry, "hostexec", "1.1", false}
 | 
			
		||||
	IpcUtils                 = ImageConfig{e2eRegistry, "ipc-utils", "1.0", false}
 | 
			
		||||
	Iperf                    = ImageConfig{e2eRegistry, "iperf", "1.0", false}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user