simplify addon code by fixing gcp-auth failure policy
parent
9cc3201d28
commit
b04610ef9b
|
@ -50,8 +50,6 @@ spec:
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
name: gcp-auth-certs-create
|
name: gcp-auth-certs-create
|
||||||
labels:
|
|
||||||
gcp-auth-skip-secret: "true"
|
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: minikube-gcp-auth-certs
|
serviceAccountName: minikube-gcp-auth-certs
|
||||||
containers:
|
containers:
|
||||||
|
@ -79,7 +77,6 @@ spec:
|
||||||
labels:
|
labels:
|
||||||
app: gcp-auth
|
app: gcp-auth
|
||||||
kubernetes.io/minikube-addons: gcp-auth
|
kubernetes.io/minikube-addons: gcp-auth
|
||||||
gcp-auth-skip-secret: "true"
|
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: gcp-auth
|
- name: gcp-auth
|
||||||
|
@ -112,8 +109,6 @@ spec:
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
name: gcp-auth-certs-patch
|
name: gcp-auth-certs-patch
|
||||||
labels:
|
|
||||||
gcp-auth-skip-secret: "true"
|
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: minikube-gcp-auth-certs
|
serviceAccountName: minikube-gcp-auth-certs
|
||||||
containers:
|
containers:
|
||||||
|
@ -136,7 +131,7 @@ metadata:
|
||||||
app: gcp-auth
|
app: gcp-auth
|
||||||
webhooks:
|
webhooks:
|
||||||
- name: gcp-auth-mutate.k8s.io
|
- name: gcp-auth-mutate.k8s.io
|
||||||
failurePolicy: Fail
|
failurePolicy: Ignore
|
||||||
objectSelector:
|
objectSelector:
|
||||||
matchExpressions:
|
matchExpressions:
|
||||||
- key: gcp-auth-skip-secret
|
- key: gcp-auth-skip-secret
|
||||||
|
|
|
@ -95,7 +95,6 @@ metadata:
|
||||||
labels:
|
labels:
|
||||||
integration-test: storage-provisioner
|
integration-test: storage-provisioner
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
gcp-auth-skip-secret: "true"
|
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: storage-provisioner
|
serviceAccountName: storage-provisioner
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
|
|
|
@ -406,18 +406,12 @@ func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]boo
|
||||||
var awg sync.WaitGroup
|
var awg sync.WaitGroup
|
||||||
|
|
||||||
enabledAddons := []string{}
|
enabledAddons := []string{}
|
||||||
deferredAddons := []string{}
|
|
||||||
|
|
||||||
defer func() { // making it show after verifications (see #7613)
|
defer func() { // making it show after verifications (see #7613)
|
||||||
register.Reg.SetStep(register.EnablingAddons)
|
register.Reg.SetStep(register.EnablingAddons)
|
||||||
out.T(style.AddonEnable, "Enabled addons: {{.addons}}", out.V{"addons": strings.Join(enabledAddons, ", ")})
|
out.T(style.AddonEnable, "Enabled addons: {{.addons}}", out.V{"addons": strings.Join(enabledAddons, ", ")})
|
||||||
}()
|
}()
|
||||||
for _, a := range toEnableList {
|
for _, a := range toEnableList {
|
||||||
if a == "gcp-auth" {
|
|
||||||
deferredAddons = append(deferredAddons, a)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
awg.Add(1)
|
awg.Add(1)
|
||||||
go func(name string) {
|
go func(name string) {
|
||||||
err := RunCallbacks(cc, name, "true")
|
err := RunCallbacks(cc, name, "true")
|
||||||
|
@ -433,16 +427,6 @@ func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]boo
|
||||||
// Wait until all of the addons are enabled before updating the config (not thread safe)
|
// Wait until all of the addons are enabled before updating the config (not thread safe)
|
||||||
awg.Wait()
|
awg.Wait()
|
||||||
|
|
||||||
// Now run the deferred addons
|
|
||||||
for _, a := range deferredAddons {
|
|
||||||
err := RunCallbacks(cc, a, "true")
|
|
||||||
if err != nil {
|
|
||||||
out.WarningT("Enabling '{{.name}}' returned an error: {{.error}}", out.V{"name": a, "error": err})
|
|
||||||
} else {
|
|
||||||
enabledAddons = append(enabledAddons, a)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, a := range enabledAddons {
|
for _, a := range enabledAddons {
|
||||||
if err := Set(cc, a, "true"); err != nil {
|
if err := Set(cc, a, "true"); err != nil {
|
||||||
glog.Errorf("store failed: %v", err)
|
glog.Errorf("store failed: %v", err)
|
||||||
|
|
Loading…
Reference in New Issue