Changes supporting k8s 1.16
Change-Id: I625753bc9ef5e28d57f320c440aef3abb246704d
This commit is contained in:
parent
40797b9d44
commit
373b15815c
|
@ -136,7 +136,7 @@ data:
|
|||
mode: 0444
|
||||
content: |
|
||||
kind: AdmissionConfiguration
|
||||
apiVersion: apiserver.k8s.io/v1alpha1
|
||||
apiVersion: apiserver.k8s.io/v1
|
||||
plugins:
|
||||
- name: EventRateLimit
|
||||
path: eventconfig.yaml
|
||||
|
|
|
@ -147,10 +147,10 @@ data:
|
|||
encryption_provider:
|
||||
file: encryption_provider.yaml
|
||||
command_options:
|
||||
- '--experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml'
|
||||
- '--encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml'
|
||||
content:
|
||||
kind: EncryptionConfig
|
||||
apiVersion: v1
|
||||
kind: EncryptionConfiguration
|
||||
apiVersion: apiserver.config.k8s.io/v1
|
||||
eventconfig:
|
||||
file: eventconfig.yaml
|
||||
content:
|
||||
|
@ -167,7 +167,7 @@ data:
|
|||
- '--admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml'
|
||||
content:
|
||||
kind: AdmissionConfiguration
|
||||
apiVersion: apiserver.k8s.io/v1alpha1
|
||||
apiVersion: apiserver.k8s.io/v1
|
||||
plugins:
|
||||
- name: EventRateLimit
|
||||
path: eventconfig.yaml
|
||||
|
|
|
@ -103,7 +103,8 @@ data:
|
|||
release_group: airship-kubernetes-controller-manager
|
||||
values:
|
||||
command_prefix:
|
||||
- /controller-manager
|
||||
- /hyperkube
|
||||
- kube-controller-manager
|
||||
- --cluster-cidr=SUB_POD_CIDR
|
||||
- --service-cluster-ip-range=SUB_SERVICE_CIDR
|
||||
- --node-monitor-period=5s
|
||||
|
|
|
@ -59,7 +59,8 @@ data:
|
|||
release_group: airship-kubernetes-proxy
|
||||
values:
|
||||
command_prefix:
|
||||
- /proxy
|
||||
- /hyperkube
|
||||
- kube-proxy
|
||||
- --cluster-cidr=POD_CIDR
|
||||
- --proxy-mode=iptables
|
||||
kube_service:
|
||||
|
|
|
@ -686,13 +686,13 @@ data:
|
|||
rgw_s3_admin: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119
|
||||
kubernetes:
|
||||
apiserver:
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
apiserver: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
apiserver: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
key_rotate: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
key_rotate: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
controller-manager:
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
coredns:
|
||||
coredns: docker.io/coredns/coredns:1.6.2
|
||||
test: quay.io/airshipit/promenade:64807416b71958e31156ef7a50e169813acc4e15
|
||||
|
@ -700,10 +700,10 @@ data:
|
|||
etcd: quay.io/coreos/etcd:v3.4.2
|
||||
etcdctl: quay.io/coreos/etcd:v3.4.2
|
||||
haproxy:
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
haproxy: docker.io/library/haproxy:1.8.19
|
||||
test: docker.io/library/python:3.6
|
||||
hyperkube: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
hyperkube: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
ingress:
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
|
@ -714,10 +714,10 @@ data:
|
|||
keepalived: docker.io/osixia/keepalived:1.4.5
|
||||
pause: gcr.io/google-containers/pause-amd64:3.1
|
||||
proxy:
|
||||
proxy: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
proxy: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
scheduler:
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
scheduler: gcr.io/google-containers/hyperkube-amd64:v1.12.9
|
||||
anchor: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
scheduler: gcr.io/google-containers/hyperkube-amd64:v1.16.2
|
||||
validation:
|
||||
pod_logs:
|
||||
image: docker.io/library/busybox:1.28.3
|
||||
|
@ -1061,7 +1061,7 @@ data:
|
|||
prometheus_postgresql_exporter_create_user: docker.io/library/postgres:9.5
|
||||
promenade:
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.11.6
|
||||
hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.16.2
|
||||
ks_endpoints: docker.io/openstackhelm/heat:newton
|
||||
ks_service: docker.io/openstackhelm/heat:newton
|
||||
ks_user: docker.io/openstackhelm/heat:newton
|
||||
|
|
|
@ -3,7 +3,7 @@ set -ex
|
|||
|
||||
CLUSTER_DNS=${CLUSTER_DNS:-10.96.0.10}
|
||||
|
||||
KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.11.6}
|
||||
KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.16.2}
|
||||
UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04}
|
||||
|
||||
cat > /tmp/hanging-cgroup-release.yaml << 'EOF'
|
||||
|
@ -42,7 +42,7 @@ data:
|
|||
EOF
|
||||
cat >> /tmp/hanging-cgroup-release.yaml << EOF
|
||||
---
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: hanging-cgroup-release
|
||||
|
|
|
@ -3,7 +3,7 @@ set -ex
|
|||
|
||||
CLUSTER_DNS=${CLUSTER_DNS:-10.96.0.10}
|
||||
|
||||
KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.11.6}
|
||||
KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.16.2}
|
||||
UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04}
|
||||
|
||||
cat > /tmp/rbd-roomba-scanner.yaml << 'EOF'
|
||||
|
@ -48,7 +48,7 @@ data:
|
|||
EOF
|
||||
cat >> /tmp/rbd-roomba-scanner.yaml << EOF
|
||||
---
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: rbd-roomba-scanner
|
||||
|
|
Loading…
Reference in New Issue