♻️ Update rbac.authorization.k8s.io/v1beta1 to v1 + vendor YAML

This bumps up all the deprecated RBAC YAML to v1.

It also updates a few vendored YAMLs.

Oh, and removes the unused Service resources from the Traefik YAMLs.

Closes #585
This commit is contained in:
Jérôme Petazzoni
2021-04-22 11:03:12 +02:00
parent 88a5041943
commit f51b5c7244
8 changed files with 271 additions and 199 deletions

View File

@@ -5,7 +5,7 @@ metadata:
name: fluentd name: fluentd
namespace: default namespace: default
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: fluentd name: fluentd
@@ -21,7 +21,7 @@ rules:
- watch - watch
--- ---
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: fluentd name: fluentd
roleRef: roleRef:

View File

@@ -11,7 +11,7 @@ metadata:
name: elasticsearch-operator name: elasticsearch-operator
namespace: elasticsearch-operator namespace: elasticsearch-operator
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: elasticsearch-operator name: elasticsearch-operator
@@ -41,7 +41,7 @@ rules:
resources: ["elasticsearchclusters"] resources: ["elasticsearchclusters"]
verbs: ["*"] verbs: ["*"]
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: elasticsearch-operator name: elasticsearch-operator
@@ -55,13 +55,16 @@ subjects:
name: elasticsearch-operator name: elasticsearch-operator
namespace: elasticsearch-operator namespace: elasticsearch-operator
--- ---
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: elasticsearch-operator name: elasticsearch-operator
namespace: elasticsearch-operator namespace: elasticsearch-operator
spec: spec:
replicas: 1 replicas: 1
selector:
matchLabels:
name: elasticsearch-operator
template: template:
metadata: metadata:
labels: labels:

View File

@@ -131,7 +131,7 @@ spec:
path: /var/lib/filebeat-data path: /var/lib/filebeat-data
type: DirectoryOrCreate type: DirectoryOrCreate
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: filebeat name: filebeat
@@ -144,7 +144,7 @@ roleRef:
name: filebeat name: filebeat
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: filebeat name: filebeat

View File

@@ -1,4 +1,4 @@
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: kubernetes-dashboard name: kubernetes-dashboard

View File

@@ -1,25 +1,25 @@
# This is a local copy of: # This is a local copy of:
# https://github.com/rancher/local-path-provisioner/blob/master/deploy/local-path-storage.yaml # https://github.com/rancher/local-path-provisioner/blob/master/deploy/local-path-storage.yaml
---
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: local-path-storage name: local-path-storage
--- ---
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: local-path-provisioner-service-account name: local-path-provisioner-service-account
namespace: local-path-storage namespace: local-path-storage
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: local-path-provisioner-role name: local-path-provisioner-role
namespace: local-path-storage
rules: rules:
- apiGroups: [ "" ] - apiGroups: [ "" ]
resources: ["nodes", "persistentvolumeclaims"] resources: [ "nodes", "persistentvolumeclaims", "configmaps" ]
verbs: [ "get", "list", "watch" ] verbs: [ "get", "list", "watch" ]
- apiGroups: [ "" ] - apiGroups: [ "" ]
resources: [ "endpoints", "persistentvolumes", "pods" ] resources: [ "endpoints", "persistentvolumes", "pods" ]
@@ -30,12 +30,12 @@ rules:
- apiGroups: [ "storage.k8s.io" ] - apiGroups: [ "storage.k8s.io" ]
resources: [ "storageclasses" ] resources: [ "storageclasses" ]
verbs: [ "get", "list", "watch" ] verbs: [ "get", "list", "watch" ]
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: local-path-provisioner-bind name: local-path-provisioner-bind
namespace: local-path-storage
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
@@ -44,6 +44,7 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: local-path-provisioner-service-account name: local-path-provisioner-service-account
namespace: local-path-storage namespace: local-path-storage
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
@@ -63,8 +64,8 @@ spec:
serviceAccountName: local-path-provisioner-service-account serviceAccountName: local-path-provisioner-service-account
containers: containers:
- name: local-path-provisioner - name: local-path-provisioner
image: rancher/local-path-provisioner:v0.0.8 image: rancher/local-path-provisioner:v0.0.19
imagePullPolicy: Always imagePullPolicy: IfNotPresent
command: command:
- local-path-provisioner - local-path-provisioner
- --debug - --debug
@@ -83,6 +84,7 @@ spec:
- name: config-volume - name: config-volume
configMap: configMap:
name: local-path-config name: local-path-config
--- ---
apiVersion: storage.k8s.io/v1 apiVersion: storage.k8s.io/v1
kind: StorageClass kind: StorageClass
@@ -91,6 +93,7 @@ metadata:
provisioner: rancher.io/local-path provisioner: rancher.io/local-path
volumeBindingMode: WaitForFirstConsumer volumeBindingMode: WaitForFirstConsumer
reclaimPolicy: Delete reclaimPolicy: Delete
--- ---
kind: ConfigMap kind: ConfigMap
apiVersion: v1 apiVersion: v1
@@ -107,4 +110,51 @@ data:
} }
] ]
} }
setup: |-
#!/bin/sh
while getopts "m:s:p:" opt
do
case $opt in
p)
absolutePath=$OPTARG
;;
s)
sizeInBytes=$OPTARG
;;
m)
volMode=$OPTARG
;;
esac
done
mkdir -m 0777 -p ${absolutePath}
teardown: |-
#!/bin/sh
while getopts "m:s:p:" opt
do
case $opt in
p)
absolutePath=$OPTARG
;;
s)
sizeInBytes=$OPTARG
;;
m)
volMode=$OPTARG
;;
esac
done
rm -rf ${absolutePath}
helperPod.yaml: |-
apiVersion: v1
kind: Pod
metadata:
name: helper-pod
spec:
containers:
- name: helper-pod
image: busybox

View File

@@ -1,32 +1,61 @@
kind: ClusterRole # This file is https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
apiVersion: rbac.authorization.k8s.io/v1 # But with the following arguments added to metrics-server:
# args:
# - --kubelet-insecure-tls
# - --metric-resolution=5s
apiVersion: v1
kind: ServiceAccount
metadata: metadata:
name: system:aggregated-metrics-reader
labels: labels:
rbac.authorization.k8s.io/aggregate-to-view: "true" k8s-app: metrics-server
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rules:
- apiGroups: ["metrics.k8s.io"]
resources: ["pods"]
verbs: ["get", "list", "watch"]
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: metrics-server:system:auth-delegator
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:auth-delegator
subjects:
- kind: ServiceAccount
name: metrics-server name: metrics-server
namespace: kube-system namespace: kube-system
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
k8s-app: metrics-server
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true"
name: system:aggregated-metrics-reader
rules:
- apiGroups:
- metrics.k8s.io
resources:
- pods
- nodes
verbs:
- get
- list
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
k8s-app: metrics-server
name: system:metrics-server
rules:
- apiGroups:
- ""
resources:
- pods
- nodes
- nodes/stats
- namespaces
- configmaps
verbs:
- get
- list
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels:
k8s-app: metrics-server
name: metrics-server-auth-reader name: metrics-server-auth-reader
namespace: kube-system namespace: kube-system
roleRef: roleRef:
@@ -38,95 +67,26 @@ subjects:
name: metrics-server name: metrics-server
namespace: kube-system namespace: kube-system
--- ---
apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService
metadata:
name: v1beta1.metrics.k8s.io
spec:
service:
name: metrics-server
namespace: kube-system
group: metrics.k8s.io
version: v1beta1
insecureSkipTLSVerify: true
groupPriorityMinimum: 100
versionPriority: 100
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: metrics-server
namespace: kube-system
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: metrics-server
namespace: kube-system
labels:
k8s-app: metrics-server
spec:
selector:
matchLabels:
k8s-app: metrics-server
template:
metadata:
name: metrics-server
labels:
k8s-app: metrics-server
spec:
serviceAccountName: metrics-server
volumes:
# mount in tmp so we can safely use from-scratch images and/or read-only containers
- name: tmp-dir
emptyDir: {}
containers:
- name: metrics-server
image: k8s.gcr.io/metrics-server-amd64:v0.3.3
imagePullPolicy: Always
volumeMounts:
- name: tmp-dir
mountPath: /tmp
args:
- --kubelet-preferred-address-types=InternalIP
- --kubelet-insecure-tls
- --metric-resolution=5s
---
apiVersion: v1
kind: Service
metadata:
name: metrics-server
namespace: kube-system
labels:
kubernetes.io/name: "Metrics-server"
spec:
selector:
k8s-app: metrics-server
ports:
- port: 443
protocol: TCP
targetPort: 443
---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRoleBinding
metadata: metadata:
name: system:metrics-server labels:
rules: k8s-app: metrics-server
- apiGroups: name: metrics-server:system:auth-delegator
- "" roleRef:
resources: apiGroup: rbac.authorization.k8s.io
- pods kind: ClusterRole
- nodes name: system:auth-delegator
- nodes/stats subjects:
verbs: - kind: ServiceAccount
- get name: metrics-server
- list namespace: kube-system
- watch
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels:
k8s-app: metrics-server
name: system:metrics-server name: system:metrics-server
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
@@ -136,3 +96,98 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: metrics-server name: metrics-server
namespace: kube-system namespace: kube-system
---
apiVersion: v1
kind: Service
metadata:
labels:
k8s-app: metrics-server
name: metrics-server
namespace: kube-system
spec:
ports:
- name: https
port: 443
protocol: TCP
targetPort: https
selector:
k8s-app: metrics-server
---
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
k8s-app: metrics-server
name: metrics-server
namespace: kube-system
spec:
selector:
matchLabels:
k8s-app: metrics-server
strategy:
rollingUpdate:
maxUnavailable: 0
template:
metadata:
labels:
k8s-app: metrics-server
spec:
containers:
- args:
- --cert-dir=/tmp
- --secure-port=4443
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --kubelet-use-node-status-port
- --kubelet-insecure-tls
- --metric-resolution=5s
image: k8s.gcr.io/metrics-server/metrics-server:v0.4.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
httpGet:
path: /livez
port: https
scheme: HTTPS
periodSeconds: 10
name: metrics-server
ports:
- containerPort: 4443
name: https
protocol: TCP
readinessProbe:
failureThreshold: 3
httpGet:
path: /readyz
port: https
scheme: HTTPS
periodSeconds: 10
securityContext:
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
volumeMounts:
- mountPath: /tmp
name: tmp-dir
nodeSelector:
kubernetes.io/os: linux
priorityClassName: system-cluster-critical
serviceAccountName: metrics-server
volumes:
- emptyDir: {}
name: tmp-dir
---
apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
labels:
k8s-app: metrics-server
name: v1beta1.metrics.k8s.io
spec:
group: metrics.k8s.io
groupPriorityMinimum: 100
insecureSkipTLSVerify: true
service:
name: metrics-server
namespace: kube-system
version: v1beta1
versionPriority: 100

View File

@@ -49,24 +49,8 @@ spec:
- --kubernetes - --kubernetes
- --logLevel=INFO - --logLevel=INFO
--- ---
kind: Service
apiVersion: v1
metadata:
name: traefik-ingress-service
namespace: kube-system
spec:
selector:
k8s-app: traefik-ingress-lb
ports:
- protocol: TCP
port: 80
name: web
- protocol: TCP
port: 8080
name: admin
---
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: traefik-ingress-controller name: traefik-ingress-controller
rules: rules:
@@ -90,7 +74,7 @@ rules:
- watch - watch
--- ---
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: traefik-ingress-controller name: traefik-ingress-controller
roleRef: roleRef:

View File

@@ -55,28 +55,8 @@ spec:
- --entrypoints.https.Address=:443 - --entrypoints.https.Address=:443
- --entrypoints.https.http.tls.certResolver=default - --entrypoints.https.http.tls.certResolver=default
--- ---
kind: Service
apiVersion: v1
metadata:
name: traefik-ingress-service
namespace: kube-system
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8080"
prometheus.io/path: "/metrics"
spec:
selector:
k8s-app: traefik-ingress-lb
ports:
- protocol: TCP
port: 80
name: web
- protocol: TCP
port: 8080
name: admin
---
kind: ClusterRole kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: traefik-ingress-controller name: traefik-ingress-controller
rules: rules:
@@ -109,7 +89,7 @@ rules:
- watch - watch
--- ---
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: traefik-ingress-controller name: traefik-ingress-controller
roleRef: roleRef: