openstack
/
openstack-helm-infra
Code Issues Proposed changes

Update to container image repo k8s.gcr.io 

gcr.io/google_containers/ no longer contains the image versions we
require, use the new location.

Change-Id: Iabb9e672e494f27d1a3691a9ce0dd2ccf10d5797
This commit is contained in:
Chris Wedgwood 2020-12-07 17:59:34 +00:00
parent e4683420d7
commit 82a828ce8d
17 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemonjob-controller/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: A Helm chart for DaemonjobController description: A Helm chart for DaemonjobController
name: daemonjob-controller name: daemonjob-controller
version: 0.1.2 version: 0.1.3
home: https://opendev.org/openstack home: https://opendev.org/openstack
... ...

2
daemonjob-controller/values.yaml
View File

@ -20,7 +20,7 @@ release_group: null
images: images:
tags: tags:
python: docker.io/python:3.7-slim python: docker.io/python:3.7-slim
pause: gcr.io/google_containers/pause:latest pause: k8s.gcr.io/pause:latest
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
local_registry: local_registry:

2
etcd/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v3.4.3 appVersion: v3.4.3
description: OpenStack-Helm etcd description: OpenStack-Helm etcd
name: etcd name: etcd
version: 0.1.1 version: 0.1.2
home: https://coreos.com/etcd/ home: https://coreos.com/etcd/
icon: https://raw.githubusercontent.com/CloudCoreo/etcd-cluster/master/images/icon.png icon: https://raw.githubusercontent.com/CloudCoreo/etcd-cluster/master/images/icon.png
sources: sources:

2
etcd/values.yaml
View File

@ -18,7 +18,7 @@
--- ---
images: images:
tags: tags:
etcd: 'gcr.io/google_containers/etcd-amd64:3.4.3' etcd: 'k8s.gcr.io/etcd-amd64:3.4.3'
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

2
falco/Chart.yaml
View File

@ -13,7 +13,7 @@
--- ---
apiVersion: v1 apiVersion: v1
name: falco name: falco
version: 0.1.1 version: 0.1.2
appVersion: 0.11.1 appVersion: 0.11.1
description: Sysdig Falco description: Sysdig Falco
keywords: keywords:

8
falco/values.yaml
View File

@ -1062,9 +1062,9 @@ conf:
not container.image startswith sysdig/falco-event-generator) or not container.image startswith sysdig/falco-event-generator) or
container.image startswith quay.io/sysdig or container.image startswith quay.io/sysdig or
container.image startswith sysdig/sysdig or container.image startswith sysdig/sysdig or
container.image startswith gcr.io/google_containers/hyperkube or container.image startswith k8s.gcr.io/hyperkube or
container.image startswith quay.io/coreos/flannel or container.image startswith quay.io/coreos/flannel or
container.image startswith gcr.io/google_containers/kube-proxy or container.image startswith k8s.gcr.io/kube-proxy or
container.image startswith calico/node or container.image startswith calico/node or
container.image startswith rook/toolbox or container.image startswith rook/toolbox or
container.image startswith registry.access.redhat.com/openshift3/logging-fluentd or container.image startswith registry.access.redhat.com/openshift3/logging-fluentd or
@ -1300,8 +1300,8 @@ conf:
condition: (fd.sip="1.2.3.4" and fd.sport=8080) condition: (fd.sip="1.2.3.4" and fd.sport=8080)
- macro: k8s_containers - macro: k8s_containers
condition: > condition: >
(container.image startswith gcr.io/google_containers/hyperkube-amd64 or (container.image startswith k8s.gcr.io/hyperkube-amd64 or
container.image startswith gcr.io/google_containers/kube2sky or container.image startswith k8s.gcr.io/kube2sky or
container.image startswith sysdig/agent or container.image startswith sysdig/agent or
container.image startswith sysdig/falco or container.image startswith sysdig/falco or
container.image startswith sysdig/sysdig) container.image startswith sysdig/sysdig)

2
ingress/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.32.0 appVersion: v0.32.0
description: OpenStack-Helm Ingress Controller description: OpenStack-Helm Ingress Controller
name: ingress name: ingress
version: 0.1.1 version: 0.1.2
home: https://github.com/kubernetes/ingress home: https://github.com/kubernetes/ingress
sources: sources:
- https://github.com/kubernetes/ingress - https://github.com/kubernetes/ingress

2
ingress/values.yaml
View File

@ -28,7 +28,7 @@ images:
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0
ingress_module_init: docker.io/openstackhelm/neutron:stein-ubuntu_bionic ingress_module_init: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
ingress_routed_vip: docker.io/openstackhelm/neutron:stein-ubuntu_bionic ingress_routed_vip: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
error_pages: gcr.io/google_containers/defaultbackend:1.4 error_pages: k8s.gcr.io/defaultbackend:1.4
keepalived: docker.io/osixia/keepalived:1.4.5 keepalived: docker.io/osixia/keepalived:1.4.5
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0

2
kube-dns/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.14.5 appVersion: v1.14.5
description: OpenStack-Helm Kube-DNS description: OpenStack-Helm Kube-DNS
name: kube-dns name: kube-dns
version: 0.1.1 version: 0.1.2
home: https://github.com/coreos/flannel home: https://github.com/coreos/flannel
icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png
sources: sources:

6
kube-dns/values.yaml
View File

@ -20,9 +20,9 @@ labels:
images: images:
tags: tags:
kube_dns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 kube_dns: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5
kube_dns_nanny: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5 kube_dns_nanny: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
kube_dns_sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5 kube_dns_sidecar: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent

2
mariadb/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v10.2.31 appVersion: v10.2.31
description: OpenStack-Helm MariaDB description: OpenStack-Helm MariaDB
name: mariadb name: mariadb
version: 0.1.4 version: 0.1.5
home: https://mariadb.com/kb/en/ home: https://mariadb.com/kb/en/
icon: http://badges.mariadb.org/mariadb-badge-180x60.png icon: http://badges.mariadb.org/mariadb-badge-180x60.png
sources: sources:

2
mariadb/values.yaml
View File

@ -22,7 +22,7 @@ images:
tags: tags:
mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
error_pages: gcr.io/google_containers/defaultbackend:1.4 error_pages: k8s.gcr.io/defaultbackend:1.4
prometheus_create_mysql_user: docker.io/mariadb:10.2.31 prometheus_create_mysql_user: docker.io/mariadb:10.2.31
prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0 prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial

2
registry/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v2.0.0 appVersion: v2.0.0
description: OpenStack-Helm Docker Registry description: OpenStack-Helm Docker Registry
name: registry name: registry
version: 0.1.1 version: 0.1.2
home: https://github.com/kubernetes/ingress home: https://github.com/kubernetes/ingress
sources: sources:
- https://opendev.org/openstack/openstack-helm - https://opendev.org/openstack/openstack-helm

2
registry/values.yaml
View File

@ -29,7 +29,7 @@ release_group: null
images: images:
tags: tags:
registry: docker.io/registry:2 registry: docker.io/registry:2
registry_proxy: gcr.io/google_containers/kube-registry-proxy:0.4 registry_proxy: k8s.gcr.io/kube-registry-proxy:0.4
bootstrap: docker.io/docker:17.07.0 bootstrap: docker.io/docker:17.07.0
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

12
tools/image-repo-overides.sh
View File

@ -13,12 +13,12 @@
# limitations under the License. # limitations under the License.
KUBE_VERSION=$(yq -r '.version.kubernetes' ./tools/gate/playbooks/vars.yaml) KUBE_VERSION=$(yq -r '.version.kubernetes' ./tools/gate/playbooks/vars.yaml)
KUBE_IMAGES="gcr.io/google_containers/kube-apiserver-amd64:${KUBE_VERSION} KUBE_IMAGES="k8s.gcr.io/kube-apiserver-amd64:${KUBE_VERSION}
gcr.io/google_containers/kube-controller-manager-amd64:${KUBE_VERSION} k8s.gcr.io/kube-controller-manager-amd64:${KUBE_VERSION}
gcr.io/google_containers/kube-proxy-amd64:${KUBE_VERSION} k8s.gcr.io/kube-proxy-amd64:${KUBE_VERSION}
gcr.io/google_containers/kube-scheduler-amd64:${KUBE_VERSION} k8s.gcr.io/kube-scheduler-amd64:${KUBE_VERSION}
gcr.io/google_containers/pause-amd64:3.0 k8s.gcr.io/pause-amd64:3.0
gcr.io/google_containers/etcd-amd64:3.4.3" k8s.gcr.io/etcd-amd64:3.4.3"
CHART_IMAGES="" CHART_IMAGES=""
for CHART_DIR in ./*/ ; do for CHART_DIR in ./*/ ; do

2
tools/images/kubeadm-aio/assets/entrypoint.sh
View File

@ -38,7 +38,7 @@ fi
: ${PVC_SUPPORT_NFS:="false"} : ${PVC_SUPPORT_NFS:="false"}
: ${HELM_TILLER_IMAGE:="gcr.io/kubernetes-helm/tiller:${HELM_VERSION}"} : ${HELM_TILLER_IMAGE:="gcr.io/kubernetes-helm/tiller:${HELM_VERSION}"}
: ${KUBE_VERSION:="${KUBE_VERSION}"} : ${KUBE_VERSION:="${KUBE_VERSION}"}
: ${KUBE_IMAGE_REPO:="gcr.io/google_containers"} : ${KUBE_IMAGE_REPO:="k8s.gcr.io"}
: ${KUBE_API_BIND_PORT:="6443"} : ${KUBE_API_BIND_PORT:="6443"}
: ${KUBE_NET_DNS_DOMAIN:="cluster.local"} : ${KUBE_NET_DNS_DOMAIN:="cluster.local"}
: ${KUBE_NET_POD_SUBNET:="192.168.0.0/16"} : ${KUBE_NET_POD_SUBNET:="192.168.0.0/16"}

2
tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
View File

@ -37,7 +37,7 @@ all:
tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0 tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0
k8s: k8s:
kubernetesVersion: v1.18.9 kubernetesVersion: v1.18.9
imageRepository: gcr.io/google_containers imageRepository: k8s.gcr.io
certificatesDir: /etc/kubernetes/pki certificatesDir: /etc/kubernetes/pki
selfHosted: false selfHosted: false
keystoneAuth: false keystoneAuth: false