Commit a5355f08 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Replace dropped v1beta1 APIs with v1

Requires updating traefik as well to drop deprecated types. Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent dc14f370
...@@ -4,7 +4,7 @@ metadata: ...@@ -4,7 +4,7 @@ metadata:
name: coredns name: coredns
namespace: kube-system namespace: kube-system
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
...@@ -29,7 +29,7 @@ rules: ...@@ -29,7 +29,7 @@ rules:
- list - list
- watch - watch
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
annotations: annotations:
......
...@@ -4,7 +4,7 @@ metadata: ...@@ -4,7 +4,7 @@ metadata:
name: local-path-provisioner-service-account name: local-path-provisioner-service-account
namespace: kube-system namespace: kube-system
--- ---
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
...@@ -22,7 +22,7 @@ rules: ...@@ -22,7 +22,7 @@ rules:
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
......
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: metrics-server:system:auth-delegator name: metrics-server:system:auth-delegator
......
--- ---
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
name: metrics-server-auth-reader name: metrics-server-auth-reader
......
--- ---
apiVersion: apiregistration.k8s.io/v1beta1 apiVersion: apiregistration.k8s.io/v1
kind: APIService kind: APIService
metadata: metadata:
name: v1beta1.metrics.k8s.io name: v1beta1.metrics.k8s.io
......
...@@ -39,7 +39,8 @@ spec: ...@@ -39,7 +39,8 @@ spec:
emptyDir: {} emptyDir: {}
containers: containers:
- name: metrics-server - name: metrics-server
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-metrics-server:v0.3.6 image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-metrics-server:v0.5.0
args: ['--cert-dir', '/tmp']
volumeMounts: volumeMounts:
- name: tmp-dir - name: tmp-dir
mountPath: /tmp mountPath: /tmp
......
---
apiVersion: helm.cattle.io/v1 apiVersion: helm.cattle.io/v1
kind: HelmChart kind: HelmChart
metadata: metadata:
name: traefik-crd name: traefik-crd
namespace: kube-system namespace: kube-system
spec: spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-9.18.2.tgz chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-10.3.0.tgz
--- ---
apiVersion: helm.cattle.io/v1 apiVersion: helm.cattle.io/v1
kind: HelmChart kind: HelmChart
...@@ -12,7 +13,7 @@ metadata: ...@@ -12,7 +13,7 @@ metadata:
name: traefik name: traefik
namespace: kube-system namespace: kube-system
spec: spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-9.18.2.tgz chart: https://%{KUBERNETES_API}%/static/charts/traefik-10.3.0.tgz
set: set:
global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%" global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
valuesContent: |- valuesContent: |-
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.2.0 ...@@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.2.0
docker.io/rancher/local-path-provisioner:v0.0.20 docker.io/rancher/local-path-provisioner:v0.0.20
docker.io/rancher/mirrored-coredns-coredns:1.8.4 docker.io/rancher/mirrored-coredns-coredns:1.8.4
docker.io/rancher/mirrored-library-busybox:1.32.1 docker.io/rancher/mirrored-library-busybox:1.32.1
docker.io/rancher/mirrored-library-traefik:2.4.8 docker.io/rancher/mirrored-library-traefik:2.5.0
docker.io/rancher/mirrored-metrics-server:v0.3.6 docker.io/rancher/mirrored-metrics-server:v0.5.0
docker.io/rancher/mirrored-pause:3.1 docker.io/rancher/mirrored-pause:3.1
...@@ -6,7 +6,7 @@ cd $(dirname $0)/.. ...@@ -6,7 +6,7 @@ cd $(dirname $0)/..
RUNC_VERSION=v1.0.1 RUNC_VERSION=v1.0.1
ROOT_VERSION=v0.9.1 ROOT_VERSION=v0.9.1
TRAEFIK_VERSION=9.18.2 # appVersion: 2.4.8 TRAEFIK_VERSION=$(awk -F/ '/traefik-([[:digit:]]+\.)/ {sub(/traefik-/, "", $6) ; sub(/\.tgz/, "", $6); print $6}' manifests/traefik.yaml)
CHARTS_DIR=build/static/charts CHARTS_DIR=build/static/charts
RUNC_DIR=build/src/github.com/opencontainers/runc RUNC_DIR=build/src/github.com/opencontainers/runc
DATA_DIR=build/data DATA_DIR=build/data
...@@ -67,9 +67,10 @@ download_and_package_traefik () { ...@@ -67,9 +67,10 @@ download_and_package_traefik () {
crd_group=$(yq e '.spec.group' ${crd_yaml}) crd_group=$(yq e '.spec.group' ${crd_yaml})
crd_kind=$(yq e '.spec.names.kind' ${crd_yaml}) crd_kind=$(yq e '.spec.names.kind' ${crd_yaml})
crd_version=$(yq e '.spec.version' ${crd_yaml}) crd_version=$(yq e '.spec.version' ${crd_yaml})
if [[ -z "$crd_version" ]]; then if [[ -z "$crd_version" ]] || [[ "$crd_version" == "null" ]]; then
crd_version=$(yq e '.spec.versions[0].name' ${crd_yaml}) crd_version=$(yq e '.spec.versions[0].name' ${crd_yaml})
fi fi
echo "Found CRD with GVK ${crd_group}/${crd_version}/${crd_kind}"
crd_apis+=("${crd_group}/${crd_version}/${crd_kind}") crd_apis+=("${crd_group}/${crd_version}/${crd_kind}")
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment