[WIP] Changes supporting k8s 1.17.3

Changes made in treasuremap to support k8s v1.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 dc6b9edb90
8 changed files with 35 additions and 28 deletions

View File

@ -88,6 +88,9 @@ metadata:
data:
apiserver:
command_prefix:
- /hyperkube
- kube-apiserver
arguments:
- --authorization-mode=Node,RBAC
- --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
@ -97,7 +100,7 @@ data:
- --feature-gates=PodShareProcessNamespace=true
- --v=3
- --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml
- --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml
- --encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml
- --requestheader-allowed-names='aggregator'
armada:
target_manifest: cluster-bootstrap

View File

@ -108,10 +108,12 @@ data:
file_path: /hyperkube
mode: 0555
- path: /opt/kubernetes/bin/kubelet
symlink: /opt/kubernetes/bin/hyperkube
tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet
mode: 0555
- path: /usr/local/bin/kubectl
symlink: /opt/kubernetes/bin/hyperkube
tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubectl
mode: 0555
- path: /etc/logrotate.d/json-logrotate
mode: 0444

View File

@ -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:

View File

@ -44,14 +44,14 @@ metadata:
name: common-addresses
path: .kubernetes.pod_cidr
dest:
path: .values.command_prefix[1]
path: .values.command_prefix[2]
pattern: SUB_POD_CIDR
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .kubernetes.service_cidr
dest:
path: .values.command_prefix[2]
path: .values.command_prefix[3]
pattern: SUB_SERVICE_CIDR
# CA
@ -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

View File

@ -32,7 +32,7 @@ metadata:
name: common-addresses
path: .kubernetes.pod_cidr
dest:
path: .values.command_prefix[1]
path: .values.command_prefix[2]
pattern: POD_CIDR
# Secrets
@ -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:

View File

@ -697,13 +697,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.17.3
apiserver: gcr.io/google-containers/hyperkube-amd64:v1.17.3
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:
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.17.3
controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.17.3
coredns:
coredns: docker.io/coredns/coredns:1.6.2
test: quay.io/airshipit/promenade:64807416b71958e31156ef7a50e169813acc4e15
@ -711,10 +711,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.17.3
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.17.3
ingress:
dep_check: 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
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.17.3
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.17.3
scheduler: gcr.io/google-containers/hyperkube-amd64:v1.17.3
validation:
pod_logs:
image: docker.io/library/busybox:1.28.3
@ -1073,7 +1073,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.17.3
ks_endpoints: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton
ks_user: docker.io/openstackhelm/heat:newton

View File

@ -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.17.3}
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
@ -92,5 +92,5 @@ docker run --rm -i \
-v /etc/kubernetes/admin:/etc/kubernetes/admin \
-e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \
${KUBECTL_IMAGE} \
/kubectl apply -f /work/hanging-cgroup-release.yaml
kubectl apply -f /work/hanging-cgroup-release.yaml

View File

@ -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.17.3}
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
@ -98,4 +98,4 @@ docker run --rm -i \
-v /etc/kubernetes/admin:/etc/kubernetes/admin \
-e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \
${KUBECTL_IMAGE} \
/kubectl apply -f /work/rbd-roomba-scanner.yaml
kubectl apply -f /work/rbd-roomba-scanner.yaml