scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 18:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use staging-csi to work around quay.io availability

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas
2020-05-19 11:49:39 -04:00
parent 6a0e01880a
commit 5c966e3beb
12 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml
View File

@@ -23,7 +23,7 @@ spec:
containers: containers:
- name: volume-snapshot-controller - name: volume-snapshot-controller
# TODO(xyang): Replace with an official image when it is released # TODO(xyang): Replace with an official image when it is released
image: quay.io/k8scsi/snapshot-controller:v2.0.0-rc2 image: gcr.io/k8s-staging-csi/snapshot-controller:v2.0.0-rc2
args: args:
- "--v=5" - "--v=5"
imagePullPolicy: Always imagePullPolicy: Always

2
test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
View File

@@ -21,7 +21,7 @@ spec:
serviceAccountName: csi-gce-pd-controller-sa serviceAccountName: csi-gce-pd-controller-sa
containers: containers:
- name: csi-snapshotter - name: csi-snapshotter
image: quay.io/k8scsi/csi-snapshotter:v2.0.1 image: gcr.io/k8s-staging-csi/csi-snapshotter:v2.0.1
args: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"

2
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml
View File

@@ -40,7 +40,7 @@ spec:
serviceAccountName: csi-attacher serviceAccountName: csi-attacher
containers: containers:
- name: csi-attacher - name: csi-attacher
image: quay.io/k8scsi/csi-attacher:v2.2.0 image: gcr.io/k8s-staging-csi/csi-attacher:v2.2.0
args: args:
- --v=5 - --v=5
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock

6
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml
View File

@@ -36,7 +36,7 @@ spec:
spec: spec:
containers: containers:
- name: node-driver-registrar - name: node-driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0 image: gcr.io/k8s-staging-csi/csi-node-driver-registrar:v1.3.0
args: args:
- --v=5 - --v=5
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock
@@ -61,7 +61,7 @@ spec:
name: csi-data-dir name: csi-data-dir
- name: hostpath - name: hostpath
image: quay.io/k8scsi/hostpathplugin:v1.4.0-rc2 image: gcr.io/k8s-staging-csi/hostpathplugin:v1.4.0-rc2
args: args:
- "--drivername=hostpath.csi.k8s.io" - "--drivername=hostpath.csi.k8s.io"
- "--v=5" - "--v=5"
@@ -109,7 +109,7 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /csi - mountPath: /csi
name: socket-dir name: socket-dir
image: quay.io/k8scsi/livenessprobe:v1.1.0 image: gcr.io/k8s-staging-csi/livenessprobe:v1.1.0
args: args:
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock
- --health-port=9898 - --health-port=9898

2
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml
View File

@@ -40,7 +40,7 @@ spec:
serviceAccountName: csi-provisioner serviceAccountName: csi-provisioner
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: quay.io/k8scsi/csi-provisioner:v1.6.0 image: gcr.io/k8s-staging-csi/csi-provisioner:v1.6.0
args: args:
- -v=5 - -v=5
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock

2
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml
View File

@@ -40,7 +40,7 @@ spec:
serviceAccountName: csi-resizer serviceAccountName: csi-resizer
containers: containers:
- name: csi-resizer - name: csi-resizer
image: quay.io/k8scsi/csi-resizer:v0.5.0 image: gcr.io/k8s-staging-csi/csi-resizer:v0.5.0
args: args:
- -v=5 - -v=5
- -csi-address=/csi/csi.sock - -csi-address=/csi/csi.sock

2
test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml
View File

@@ -40,7 +40,7 @@ spec:
serviceAccount: csi-snapshotter serviceAccount: csi-snapshotter
containers: containers:
- name: csi-snapshotter - name: csi-snapshotter
image: quay.io/k8scsi/csi-snapshotter:v2.1.0 image: gcr.io/k8s-staging-csi/csi-snapshotter:v2.1.0
args: args:
- -v=5 - -v=5
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock

2
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock serviceAccountName: csi-mock
containers: containers:
- name: csi-attacher - name: csi-attacher
image: quay.io/k8scsi/csi-attacher:v3.0.0-rc1 image: gcr.io/k8s-staging-csi/csi-attacher:v3.0.0-rc1
args: args:
- --v=5 - --v=5
- --csi-address=$(ADDRESS) - --csi-address=$(ADDRESS)

2
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock serviceAccountName: csi-mock
containers: containers:
- name: csi-resizer - name: csi-resizer
image: quay.io/k8scsi/csi-resizer:v0.4.0 image: gcr.io/k8s-staging-csi/csi-resizer:v0.4.0
args: args:
- "--v=5" - "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"

6
test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: csi-mock serviceAccountName: csi-mock
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: quay.io/k8scsi/csi-provisioner:v2.0.0-rc1 image: gcr.io/k8s-staging-csi/csi-provisioner:v2.0.0-rc1
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
# Topology support is needed for the pod rescheduling test # Topology support is needed for the pod rescheduling test
@@ -29,7 +29,7 @@ spec:
- mountPath: /csi - mountPath: /csi
name: socket-dir name: socket-dir
- name: driver-registrar - name: driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0 image: gcr.io/k8s-staging-csi/csi-node-driver-registrar:v1.2.0
args: args:
- --v=5 - --v=5
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock
@@ -48,7 +48,7 @@ spec:
- mountPath: /registration - mountPath: /registration
name: registration-dir name: registration-dir
- name: mock - name: mock
image: quay.io/k8scsi/mock-driver:v3.1.0 image: gcr.io/k8s-staging-csi/mock-driver:v3.1.0
args: args:
- "--name=mock.storage.k8s.io" - "--name=mock.storage.k8s.io"
- "--permissive-target-path" # because of https://github.com/kubernetes/kubernetes/issues/75535 - "--permissive-target-path" # because of https://github.com/kubernetes/kubernetes/issues/75535

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

@@ -40,7 +40,7 @@ type RegistryList struct {
GoogleContainerRegistry string `yaml:"googleContainerRegistry"` GoogleContainerRegistry string `yaml:"googleContainerRegistry"`
PrivateRegistry string `yaml:"privateRegistry"` PrivateRegistry string `yaml:"privateRegistry"`
SampleRegistry string `yaml:"sampleRegistry"` SampleRegistry string `yaml:"sampleRegistry"`
QuayK8sCSI string `yaml:"quayK8sCSI"` K8sCSI string `yaml:"k8sCSI"`
QuayIncubator string `yaml:"quayIncubator"` QuayIncubator string `yaml:"quayIncubator"`
} }
@@ -82,7 +82,7 @@ func initReg() RegistryList {
GoogleContainerRegistry: "gcr.io/google-containers", GoogleContainerRegistry: "gcr.io/google-containers",
PrivateRegistry: "gcr.io/k8s-authenticated-test", PrivateRegistry: "gcr.io/k8s-authenticated-test",
SampleRegistry: "gcr.io/google-samples", SampleRegistry: "gcr.io/google-samples",
QuayK8sCSI: "quay.io/k8scsi", K8sCSI: "gcr.io/k8s-staging-csi",
QuayIncubator: "quay.io/kubernetes_incubator", QuayIncubator: "quay.io/kubernetes_incubator",
} }
repoList := os.Getenv("KUBE_TEST_REPO_LIST") repoList := os.Getenv("KUBE_TEST_REPO_LIST")
@@ -113,7 +113,7 @@ var (
gcRegistry = registry.GcRegistry gcRegistry = registry.GcRegistry
gcrReleaseRegistry = registry.GcrReleaseRegistry gcrReleaseRegistry = registry.GcrReleaseRegistry
invalidRegistry = registry.InvalidRegistry invalidRegistry = registry.InvalidRegistry
quayK8sCSI = registry.QuayK8sCSI k8sCSI = registry.K8sCSI
quayIncubator = registry.QuayIncubator quayIncubator = registry.QuayIncubator
// PrivateRegistry is an image repository that requires authentication // PrivateRegistry is an image repository that requires authentication
PrivateRegistry = registry.PrivateRegistry PrivateRegistry = registry.PrivateRegistry
@@ -291,8 +291,8 @@ func ReplaceRegistryInImageURL(imageURL string) (string, error) {
registryAndUser = gcrReleaseRegistry registryAndUser = gcrReleaseRegistry
case "docker.io/library": case "docker.io/library":
registryAndUser = dockerLibraryRegistry registryAndUser = dockerLibraryRegistry
case "quay.io/k8scsi": case "gcr.io/k8s-staging-csi":
registryAndUser = quayK8sCSI registryAndUser = k8sCSI
default: default:
if countParts == 1 { if countParts == 1 {
// We assume we found an image from docker hub library // We assume we found an image from docker hub library

6
test/utils/image/manifest_test.go
View File

@@ -87,9 +87,9 @@ var registryTests = []struct {
}, },
}, },
{ {
"quay.io/k8scsi/test:latest", "gcr.io/k8s-staging-csi/test:latest",
result{ result{
result: "test.io/k8scsi/test:latest", result: "test.io/k8s-staging-csi/test:latest",
err: nil, err: nil,
}, },
}, },
@@ -111,7 +111,7 @@ func TestReplaceRegistryInImageURL(t *testing.T) {
gcrReleaseRegistry = "test.io/gke-release" gcrReleaseRegistry = "test.io/gke-release"
PrivateRegistry = "test.io/k8s-authenticated-test" PrivateRegistry = "test.io/k8s-authenticated-test"
sampleRegistry = "test.io/google-samples" sampleRegistry = "test.io/google-samples"
quayK8sCSI = "test.io/k8scsi" k8sCSI = "test.io/k8s-staging-csi"
for _, tt := range registryTests { for _, tt := range registryTests {
t.Run(tt.in, func(t *testing.T) { t.Run(tt.in, func(t *testing.T) {