kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update yaml templates to v1beta3 for update k8s version job

pull/13490/head
Sharif Elgamal 2022-01-25 15:19:08 -08:00
parent 131dad7403
commit 7c9e458133
10 changed files with 36 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/update/kubernetes_version/templates/v1beta2/containerd-api-port.yaml → hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -33,14 +33,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:12345
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/containerd-pod-network-cidr.yaml → hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -33,14 +33,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "192.168.32.0/20"

8
hack/update/kubernetes_version/templates/v1beta2/containerd.yaml → hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -33,14 +33,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/crio-options-gates.yaml → hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -39,14 +39,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/crio.yaml → hack/update/kubernetes_version/templates/v1beta3/crio.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -33,14 +33,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/default.yaml → hack/update/kubernetes_version/templates/v1beta3/default.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -33,14 +33,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/dns.yaml → hack/update/kubernetes_version/templates/v1beta3/dns.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -33,14 +33,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: minikube.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/image-repository.yaml → hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
imageRepository: test/repo
apiServer:
@ -34,14 +34,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

8
hack/update/kubernetes_version/templates/v1beta2/options.yaml → hack/update/kubernetes_version/templates/v1beta3/options.yaml
View File

@ -1,4 +1,4 @@
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: 1.1.1.1
@ -17,7 +17,7 @@ nodeRegistration:
node-ip: 1.1.1.1
taints: []
---
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
kind: ClusterConfiguration
apiServer:
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
@ -36,14 +36,12 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: mk
controlPlaneEndpoint: control-plane.minikube.internal:8443
dns:
type: CoreDNS
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
kubernetesVersion: v1.19.0
kubernetesVersion: v1.23.0
networking:
dnsDomain: cluster.local
podSubnet: "10.244.0.0/16"

18
hack/update/kubernetes_version/update_kubernetes_version.go
View File

@ -57,55 +57,55 @@ var (
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd-api-port.yaml": {
Content: update.Loadf("templates/v1beta2/containerd-api-port.yaml"),
Content: update.Loadf("templates/v1beta3/containerd-api-port.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd-pod-network-cidr.yaml": {
Content: update.Loadf("templates/v1beta2/containerd-pod-network-cidr.yaml"),
Content: update.Loadf("templates/v1beta3/containerd-pod-network-cidr.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/containerd.yaml": {
Content: update.Loadf("templates/v1beta2/containerd.yaml"),
Content: update.Loadf("templates/v1beta3/containerd.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/crio-options-gates.yaml": {
Content: update.Loadf("templates/v1beta2/crio-options-gates.yaml"),
Content: update.Loadf("templates/v1beta3/crio-options-gates.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/crio.yaml": {
Content: update.Loadf("templates/v1beta2/crio.yaml"),
Content: update.Loadf("templates/v1beta3/crio.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/default.yaml": {
Content: update.Loadf("templates/v1beta2/default.yaml"),
Content: update.Loadf("templates/v1beta3/default.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/dns.yaml": {
Content: update.Loadf("templates/v1beta2/dns.yaml"),
Content: update.Loadf("templates/v1beta3/dns.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/image-repository.yaml": {
Content: update.Loadf("templates/v1beta2/image-repository.yaml"),
Content: update.Loadf("templates/v1beta3/image-repository.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},
},
"pkg/minikube/bootstrapper/bsutil/testdata/{{.LatestVersionMM}}/options.yaml": {
Content: update.Loadf("templates/v1beta2/options.yaml"),
Content: update.Loadf("templates/v1beta3/options.yaml"),
Replace: map[string]string{
`kubernetesVersion:.*`: `kubernetesVersion: {{.LatestVersionP0}}`,
},