treewide: remove shadowing of stdlib functions
Change-Id: Iaccb22769d53568f6a4004924c218b9929090d89
Reviewed-on: https://review.monogon.dev/c/monogon/+/2957
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/node/kubernetes/pki/kubernetes.go b/metropolis/node/kubernetes/pki/kubernetes.go
index 962e70d..a30aeda 100644
--- a/metropolis/node/kubernetes/pki/kubernetes.go
+++ b/metropolis/node/kubernetes/pki/kubernetes.go
@@ -109,7 +109,7 @@
Certificates: make(map[KubeCertificateName]*opki.Certificate),
}
- make := func(i, name KubeCertificateName, template x509.Certificate) {
+ makeCert := func(i, name KubeCertificateName, template x509.Certificate) {
pki.Certificates[name] = &opki.Certificate{
Namespace: &pki.namespace,
Issuer: pki.Certificates[i],
@@ -126,7 +126,7 @@
Template: opki.CA("Metropolis Kubernetes ID CA"),
Mode: opki.CertificateManaged,
}
- make(IdCA, APIServer, opki.Server(
+ makeCert(IdCA, APIServer, opki.Server(
[]string{
"kubernetes",
"kubernetes.default",
@@ -141,12 +141,12 @@
// TODO(q3k): add service network internal apiserver address
[]net.IP{{10, 224, 0, 1}, {127, 0, 0, 1}},
))
- make(IdCA, APIServerKubeletClient, opki.Client("metropolis:apiserver-kubelet-client", nil))
- make(IdCA, ControllerManagerClient, opki.Client("system:kube-controller-manager", nil))
- make(IdCA, ControllerManager, opki.Server([]string{"kube-controller-manager.local"}, nil))
- make(IdCA, SchedulerClient, opki.Client("system:kube-scheduler", nil))
- make(IdCA, Scheduler, opki.Server([]string{"kube-scheduler.local"}, nil))
- make(IdCA, Master, opki.Client("metropolis:master", []string{"system:masters"}))
+ makeCert(IdCA, APIServerKubeletClient, opki.Client("metropolis:apiserver-kubelet-client", nil))
+ makeCert(IdCA, ControllerManagerClient, opki.Client("system:kube-controller-manager", nil))
+ makeCert(IdCA, ControllerManager, opki.Server([]string{"kube-controller-manager.local"}, nil))
+ makeCert(IdCA, SchedulerClient, opki.Client("system:kube-scheduler", nil))
+ makeCert(IdCA, Scheduler, opki.Server([]string{"kube-scheduler.local"}, nil))
+ makeCert(IdCA, Master, opki.Client("metropolis:master", []string{"system:masters"}))
pki.Certificates[AggregationCA] = &opki.Certificate{
Namespace: &pki.namespace,
@@ -155,8 +155,8 @@
Template: opki.CA("Metropolis OpenAPI Aggregation CA"),
Mode: opki.CertificateManaged,
}
- make(AggregationCA, FrontProxyClient, opki.Client("front-proxy-client", nil))
- make(AggregationCA, MetropolisAuthProxyClient, opki.Client("metropolis-auth-proxy-client", nil))
+ makeCert(AggregationCA, FrontProxyClient, opki.Client("front-proxy-client", nil))
+ makeCert(AggregationCA, MetropolisAuthProxyClient, opki.Client("metropolis-auth-proxy-client", nil))
return &pki
}
diff --git a/metropolis/pkg/smbios/smbios.go b/metropolis/pkg/smbios/smbios.go
index 0080278..e9bcfc3 100644
--- a/metropolis/pkg/smbios/smbios.go
+++ b/metropolis/pkg/smbios/smbios.go
@@ -194,9 +194,9 @@
hasAborted := false
for i := 2; i < numFields; i++ {
fieldType := v.Type().Field(i)
- if min := fieldType.Tag.Get("smbios_min_ver"); min != "" {
+ if minVer := fieldType.Tag.Get("smbios_min_ver"); minVer != "" {
var ver Version
- if _, err := fmt.Sscanf(min, "%d.%d", &ver.Major, &ver.Minor); err != nil {
+ if _, err := fmt.Sscanf(minVer, "%d.%d", &ver.Major, &ver.Minor); err != nil {
panic(fmt.Sprintf("invalid smbios_min_ver tag in %v: %v", fieldType.Name, err))
}
completedVersion = parsingVersion