Merge pull request #1715 from mariusgrigoriu/master

Play nicely with roles that don't allow creating namespaces
pull/1746/head
Matt Butcher 9 years ago committed by GitHub
commit b28b58ad8b

@ -32,10 +32,19 @@ func createNamespace(client internalclientset.Interface, namespace string) error
return err return err
} }
func getNamespace(client internalclientset.Interface, namespace string) (*api.Namespace, error) {
return client.Core().Namespaces().Get(namespace)
}
func ensureNamespace(client internalclientset.Interface, namespace string) error { func ensureNamespace(client internalclientset.Interface, namespace string) error {
err := createNamespace(client, namespace) if _, getError := getNamespace(client, namespace); getError != nil && errors.IsNotFound(getError) {
if err != nil && !errors.IsAlreadyExists(err) { createError := createNamespace(client, namespace)
return err if createError != nil {
return createError
}
} else if getError != nil {
return getError
} }
return nil return nil
} }

Loading…
Cancel
Save