Merge pull request #72203 from liggitt/addon-apps-v1

Change add-on manifests to apps/v1
This commit is contained in:
Kubernetes Prow Robot 2018-12-26 09:18:45 -08:00 committed by GitHub
commit 214efa9cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 70 additions and 38 deletions

View File

@ -44,12 +44,11 @@ KUBECTL_PRUNE_WHITELIST=(
core/v1/Service
batch/v1/Job
batch/v1beta1/CronJob
extensions/v1beta1/DaemonSet
extensions/v1beta1/Deployment
apps/v1/DaemonSet
apps/v1/Deployment
apps/v1/ReplicaSet
apps/v1/StatefulSet
extensions/v1beta1/Ingress
extensions/v1beta1/ReplicaSet
apps/v1beta1/StatefulSet
apps/v1beta1/Deployment
)
ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-60}

View File

@ -1,5 +1,5 @@
kind: DaemonSet
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: calico-node
namespace: kube-system

View File

@ -1,5 +1,5 @@
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: calico-node-vertical-autoscaler
namespace: kube-system
@ -9,6 +9,9 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
spec:
replicas: 1
selector:
matchLabels:
k8s-app: calico-node-autoscaler
template:
metadata:
labels:

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: calico-typha
@ -9,6 +9,9 @@ metadata:
k8s-app: calico-typha
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
k8s-app: calico-typha
template:
metadata:
labels:

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: calico-typha-horizontal-autoscaler
@ -9,6 +9,9 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
spec:
replicas: 1
selector:
matchLabels:
k8s-app: calico-typha-autoscaler
template:
metadata:
labels:

View File

@ -1,5 +1,5 @@
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: calico-typha-vertical-autoscaler
namespace: kube-system
@ -9,6 +9,9 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
spec:
replicas: 1
selector:
matchLabels:
k8s-app: calico-typha-autoscaler
template:
metadata:
labels:

View File

@ -33,7 +33,7 @@ data:
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: heapster-v1.6.0-beta.1

View File

@ -33,7 +33,7 @@ data:
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: heapster-v1.6.0-beta.1

View File

@ -33,7 +33,7 @@ data:
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: heapster-v1.6.0-beta.1

View File

@ -1,5 +1,5 @@
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: monitoring-influxdb-grafana-v4
namespace: kube-system

View File

@ -20,7 +20,7 @@ data:
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: heapster-v1.6.0-beta.1

View File

@ -20,7 +20,7 @@ data:
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: heapster-v1.6.0-beta.1

View File

@ -77,7 +77,7 @@ data:
loadbalance
}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: coredns

View File

@ -77,7 +77,7 @@ data:
loadbalance
}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: coredns

View File

@ -77,7 +77,7 @@ data:
loadbalance
}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: coredns

View File

@ -56,7 +56,7 @@ metadata:
labels:
addonmanager.kubernetes.io/mode: EnsureExists
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: kube-dns

View File

@ -56,7 +56,7 @@ metadata:
labels:
addonmanager.kubernetes.io/mode: EnsureExists
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: kube-dns

View File

@ -56,7 +56,7 @@ metadata:
labels:
addonmanager.kubernetes.io/mode: EnsureExists
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: kube-dns

View File

@ -26,7 +26,7 @@ subjects:
name: event-exporter-sa
namespace: kube-system
---
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: event-exporter-v0.2.3

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: fluentd-gcp-{{ fluentd_gcp_yaml_version }}
@ -9,6 +9,10 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
version: {{ fluentd_gcp_yaml_version }}
spec:
selector:
matchLabels:
k8s-app: fluentd-gcp
version: {{ fluentd_gcp_yaml_version }}
updateStrategy:
type: RollingUpdate
template:

View File

@ -9,7 +9,7 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
---
# https://github.com/kubernetes-incubator/ip-masq-agent/blob/v2.0.0/README.md
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: ip-masq-agent
@ -17,6 +17,10 @@ metadata:
labels:
addonmanager.kubernetes.io/mode: Reconcile
spec:
selector:
matchLabels:
labels:
k8s-app: ip-masq-agent
template:
metadata:
labels:

View File

@ -1,7 +1,7 @@
# Please keep kube-proxy configuration in-sync with:
# cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
labels:

View File

@ -8,7 +8,7 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
---
kind: DaemonSet
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
labels:
app: metadata-agent
@ -69,7 +69,7 @@ spec:
type: RollingUpdate
---
kind: Deployment
apiVersion: apps/v1beta1
apiVersion: apps/v1
metadata:
labels:
app: metadata-agent-cluster-level

View File

@ -8,7 +8,7 @@ metadata:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: metadata-proxy-v0.1
@ -19,6 +19,10 @@ metadata:
addonmanager.kubernetes.io/mode: Reconcile
version: v0.1
spec:
selector:
matchLabels:
k8s-app: metadata-proxy
version: v0.1
updateStrategy:
type: RollingUpdate
template:

View File

@ -20,7 +20,7 @@ data:
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: metrics-server-v0.3.1

View File

@ -23,7 +23,7 @@ subjects:
name: node-problem-detector
namespace: kube-system
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: npd-v0.4.1
@ -34,6 +34,10 @@ metadata:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
selector:
matchLabels:
k8s-app: node-problem-detector
version: v0.4.1
template:
metadata:
labels:

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: alertmanager

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: kube-state-metrics

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: node-exporter

View File

@ -926,7 +926,7 @@ def launch_default_ingress_controller():
if get_version('kubelet') < (1, 9):
context['daemonset_api_version'] = 'extensions/v1beta1'
else:
context['daemonset_api_version'] = 'apps/v1beta2'
context['daemonset_api_version'] = 'apps/v1'
context['juju_application'] = hookenv.service_name()
manifest = addon_path.format('ingress-daemon-set.yaml')
render('ingress-daemon-set.yaml', manifest, context)

View File

@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
creationTimestamp: null

View File

@ -7,11 +7,16 @@ metadata:
provisioner: fuseim.pri/ifs
---
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: nfs-client-provisioner
labels:
app: nfs-client-provisioner
spec:
replicas: 1
selector:
matchLabels:
app: nfs-client-provisioner
strategy:
type: Recreate
template:

View File

@ -20,7 +20,7 @@ type: Opaque
data:
service-account.json: {{.ServiceAccountCredentials}}
---
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: logexporter