Changes supporting k8s 1.16

Change-Id: I625753bc9ef5e28d57f320c440aef3abb246704d
This commit is contained in:
Samuel Pilla 2019-10-15 01:06:38 -05:00
parent c7a76368aa
commit 135e6ff891
4 changed files with 9 additions and 7 deletions

View File

@ -135,7 +135,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

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

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

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: