From 4d70a36c2525d77150071437f53accc5709ae7b6 Mon Sep 17 00:00:00 2001 From: xin gu <418294249@qq.com> Date: Fri, 24 Mar 2023 01:48:31 +0800 Subject: [PATCH] emove the kyaml/openapi/kubernetesapi/v1_21_2/swagger.pb (#5077) --- api/krusty/namereference_test.go | 14 +++++++------- api/krusty/transformersarrays_test.go | 8 ++++---- api/krusty/variableref_test.go | 4 ++-- releasing/README.md | 2 +- .../en/docs/Getting started/installation.md | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/krusty/namereference_test.go b/api/krusty/namereference_test.go index c39c51715..f40c248f2 100644 --- a/api/krusty/namereference_test.go +++ b/api/krusty/namereference_test.go @@ -42,7 +42,7 @@ spec: serviceAccountName: mySvcAcct containers: - name: whatever - image: k8s.gcr.io/governmentCheese + image: registry.k8s.io/governmentCheese `) th.WriteF("base/serviceAccount.yaml", ` apiVersion: v1 @@ -61,7 +61,7 @@ spec: template: spec: containers: - - image: k8s.gcr.io/governmentCheese + - image: registry.k8s.io/governmentCheese name: whatever serviceAccountName: mySvcAcct --- @@ -80,7 +80,7 @@ spec: template: spec: containers: - - image: k8s.gcr.io/governmentCheese + - image: registry.k8s.io/governmentCheese name: whatever serviceAccountName: mySvcAcct-private --- @@ -115,7 +115,7 @@ commonLabels: app: external-dns instance: public images: -- name: k8s.gcr.io/external-dns/external-dns +- name: registry.k8s.io/external-dns/external-dns newName: xxx.azurecr.io/external-dns newTag: v0.7.4_sylr.1 - name: quay.io/sylr/external-dns @@ -153,7 +153,7 @@ commonLabels: app: external-dns instance: private images: -- name: k8s.gcr.io/external-dns/external-dns +- name: registry.k8s.io/external-dns/external-dns newName: xxx.azurecr.io/external-dns newTag: v0.7.4_sylr.1 - name: quay.io/sylr/external-dns @@ -192,7 +192,7 @@ commonLabels: app: external-dns instance: public images: -- name: k8s.gcr.io/external-dns/external-dns +- name: registry.k8s.io/external-dns/external-dns newName: quay.io/sylr/external-dns newTag: v0.7.4-73-g00a9a0c7 secretGenerator: @@ -243,7 +243,7 @@ spec: serviceAccountName: external-dns containers: - name: external-dns - image: k8s.gcr.io/external-dns/external-dns + image: registry.k8s.io/external-dns/external-dns args: - --domain-filter="" - --txt-owner-id="" diff --git a/api/krusty/transformersarrays_test.go b/api/krusty/transformersarrays_test.go index 17cd88e22..5a178beb7 100644 --- a/api/krusty/transformersarrays_test.go +++ b/api/krusty/transformersarrays_test.go @@ -37,7 +37,7 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web @@ -62,7 +62,7 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web @@ -116,7 +116,7 @@ spec: notIn: arrays spec: containers: - - image: k8s.gcr.io/nginx-slim:0.8 + - image: registry.k8s.io/nginx-slim:0.8 name: nginx ports: - containerPort: 80 @@ -142,7 +142,7 @@ spec: notIn: arrays spec: containers: - - image: k8s.gcr.io/nginx-slim:0.8 + - image: registry.k8s.io/nginx-slim:0.8 name: nginx ports: - containerPort: 80 diff --git a/api/krusty/variableref_test.go b/api/krusty/variableref_test.go index 7ff5cdb7e..feab7d058 100644 --- a/api/krusty/variableref_test.go +++ b/api/krusty/variableref_test.go @@ -1848,7 +1848,7 @@ spec: terminationGracePeriodSeconds: 10 containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web @@ -2123,7 +2123,7 @@ spec: app: nginx spec: containers: - - image: k8s.gcr.io/nginx-slim:0.8 + - image: registry.k8s.io/nginx-slim:0.8 name: nginx ports: - containerPort: 80 diff --git a/releasing/README.md b/releasing/README.md index 235e4bba0..21d794764 100644 --- a/releasing/README.md +++ b/releasing/README.md @@ -363,7 +363,7 @@ Fork and clone the [k8s.io] repo. Checkout a new branch. -Edit file `k8s.gcr.io/images/k8s-staging-kustomize/images.yaml` +Edit file `registry.k8s.io/images/k8s-staging-kustomize/images.yaml` to add the new kustomize version and the image sha256. Image sha256 can be found in the image registry in the GCP diff --git a/site/content/en/docs/Getting started/installation.md b/site/content/en/docs/Getting started/installation.md index 7ace04a47..560a4941f 100644 --- a/site/content/en/docs/Getting started/installation.md +++ b/site/content/en/docs/Getting started/installation.md @@ -54,8 +54,8 @@ See [GCR page] for available images. The following commands are how to pull and run kustomize {{}} docker image. ```bash -docker pull k8s.gcr.io/kustomize/kustomize:{{< example-version >}} -docker run k8s.gcr.io/kustomize/kustomize:{{< example-version >}} version +docker pull registry.k8s.io/kustomize/kustomize:{{< example-version >}} +docker run registry.k8s.io/kustomize/kustomize:{{< example-version >}} version ``` ## Go Source