airship
/
treasuremap
Code Issues Proposed changes

[WIP] Changes supporting k8s 1.17 

Change-Id: I625753bc9ef5e28d57f320c440aef3abb246704d
This commit is contained in:
Samuel Pilla 2020-01-10 11:12:49 -06:00 committed by Smruti Soumitra Khuntia
parent 1678cf635f
commit bcec2bcbab
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global/profiles/genesis.yaml
View File

@ -136,7 +136,7 @@ data:
mode: 0444 mode: 0444
content: | content: |
kind: AdmissionConfiguration kind: AdmissionConfiguration
apiVersion: apiserver.k8s.io/v1alpha1 apiVersion: apiserver.k8s.io/v1
plugins: plugins:
- name: EventRateLimit - name: EventRateLimit
path: eventconfig.yaml path: eventconfig.yaml

8
global/software/charts/kubernetes/core/apiserver.yaml
View File

@ -147,10 +147,10 @@ data:
encryption_provider: encryption_provider:
file: encryption_provider.yaml file: encryption_provider.yaml
command_options: command_options:
- '--experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml' - '--encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml'
content: content:
kind: EncryptionConfig kind: EncryptionConfiguration
apiVersion: v1 apiVersion: apiserver.config.k8s.io/v1
eventconfig: eventconfig:
file: eventconfig.yaml file: eventconfig.yaml
content: content:
@ -167,7 +167,7 @@ data:
- '--admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml' - '--admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml'
content: content:
kind: AdmissionConfiguration kind: AdmissionConfiguration
apiVersion: apiserver.k8s.io/v1alpha1 apiVersion: apiserver.k8s.io/v1
plugins: plugins:
- name: EventRateLimit - name: EventRateLimit
path: eventconfig.yaml path: eventconfig.yaml

3
global/software/charts/kubernetes/core/controller-manager.yaml
View File

@ -103,7 +103,8 @@ data:
release_group: airship-kubernetes-controller-manager release_group: airship-kubernetes-controller-manager
values: values:
command_prefix: command_prefix:
- /controller-manager - /hyperkube
- kube-controller-manager
- --cluster-cidr=SUB_POD_CIDR - --cluster-cidr=SUB_POD_CIDR
- --service-cluster-ip-range=SUB_SERVICE_CIDR - --service-cluster-ip-range=SUB_SERVICE_CIDR
- --node-monitor-period=5s - --node-monitor-period=5s

3
global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml
View File

@ -59,7 +59,8 @@ data:
release_group: airship-kubernetes-proxy release_group: airship-kubernetes-proxy
values: values:
command_prefix: command_prefix:
- /proxy - /hyperkube
- kube-proxy
- --cluster-cidr=POD_CIDR - --cluster-cidr=POD_CIDR
- --proxy-mode=iptables - --proxy-mode=iptables
kube_service: kube_service:

22
global/software/config/versions.yaml
View File

@ -697,13 +697,13 @@ data:
rgw_s3_admin: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 rgw_s3_admin: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119
kubernetes: kubernetes:
apiserver: apiserver:
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3
apiserver: gcr.io/google-containers/hyperkube-amd64:v1.12.9 apiserver: gcr.io/google-containers/hyperkube-amd64:v1.17.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 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.17.3
controller-manager: controller-manager:
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3
controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.12.9 controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.17.3
coredns: coredns:
coredns: docker.io/coredns/coredns:1.6.2 coredns: docker.io/coredns/coredns:1.6.2
test: quay.io/airshipit/promenade:64807416b71958e31156ef7a50e169813acc4e15 test: quay.io/airshipit/promenade:64807416b71958e31156ef7a50e169813acc4e15
@ -711,10 +711,10 @@ data:
etcd: quay.io/coreos/etcd:v3.4.2 etcd: quay.io/coreos/etcd:v3.4.2
etcdctl: quay.io/coreos/etcd:v3.4.2 etcdctl: quay.io/coreos/etcd:v3.4.2
haproxy: haproxy:
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3
haproxy: docker.io/library/haproxy:1.8.19 haproxy: docker.io/library/haproxy:1.8.19
test: docker.io/library/python:3.6 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.17.3
ingress: ingress:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
@ -725,10 +725,10 @@ data:
keepalived: docker.io/osixia/keepalived:1.4.5 keepalived: docker.io/osixia/keepalived:1.4.5
pause: gcr.io/google-containers/pause-amd64:3.1 pause: gcr.io/google-containers/pause-amd64:3.1
proxy: proxy:
proxy: gcr.io/google-containers/hyperkube-amd64:v1.12.9 proxy: gcr.io/google-containers/hyperkube-amd64:v1.17.3
scheduler: scheduler:
anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3
scheduler: gcr.io/google-containers/hyperkube-amd64:v1.12.9 scheduler: gcr.io/google-containers/hyperkube-amd64:v1.17.3
validation: validation:
pod_logs: pod_logs:
image: docker.io/library/busybox:1.28.3 image: docker.io/library/busybox:1.28.3
@ -1073,7 +1073,7 @@ data:
prometheus_postgresql_exporter_create_user: docker.io/library/postgres:9.5 prometheus_postgresql_exporter_create_user: docker.io/library/postgres:9.5
promenade: promenade:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 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.17.3
ks_endpoints: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton
ks_user: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton

6
tools/fixes/hanging-cgroup-release.sh
View File

@ -3,7 +3,7 @@ set -ex
CLUSTER_DNS=${CLUSTER_DNS:-10.96.0.10} 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.17.3}
UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04} UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04}
cat > /tmp/hanging-cgroup-release.yaml << 'EOF' cat > /tmp/hanging-cgroup-release.yaml << 'EOF'
@ -42,7 +42,7 @@ data:
EOF EOF
cat >> /tmp/hanging-cgroup-release.yaml << EOF cat >> /tmp/hanging-cgroup-release.yaml << EOF
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: hanging-cgroup-release name: hanging-cgroup-release
@ -92,5 +92,5 @@ docker run --rm -i \
-v /etc/kubernetes/admin:/etc/kubernetes/admin \ -v /etc/kubernetes/admin:/etc/kubernetes/admin \
-e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \ -e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \
${KUBECTL_IMAGE} \ ${KUBECTL_IMAGE} \
/kubectl apply -f /work/hanging-cgroup-release.yaml kubectl apply -f /work/hanging-cgroup-release.yaml

6
tools/fixes/rbd-roomba-scanner.sh
View File

@ -3,7 +3,7 @@ set -ex
CLUSTER_DNS=${CLUSTER_DNS:-10.96.0.10} 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.17.3}
UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04} UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04}
cat > /tmp/rbd-roomba-scanner.yaml << 'EOF' cat > /tmp/rbd-roomba-scanner.yaml << 'EOF'
@ -48,7 +48,7 @@ data:
EOF EOF
cat >> /tmp/rbd-roomba-scanner.yaml << EOF cat >> /tmp/rbd-roomba-scanner.yaml << EOF
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: rbd-roomba-scanner name: rbd-roomba-scanner
@ -98,4 +98,4 @@ docker run --rm -i \
-v /etc/kubernetes/admin:/etc/kubernetes/admin \ -v /etc/kubernetes/admin:/etc/kubernetes/admin \
-e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \ -e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \
${KUBECTL_IMAGE} \ ${KUBECTL_IMAGE} \
/kubectl apply -f /work/rbd-roomba-scanner.yaml kubectl apply -f /work/rbd-roomba-scanner.yaml