|
|
@ -28,6 +28,7 @@ import (
|
|
|
|
const (
|
|
|
|
const (
|
|
|
|
deploymentName = "tiller-deploy"
|
|
|
|
deploymentName = "tiller-deploy"
|
|
|
|
serviceName = "tiller-deploy"
|
|
|
|
serviceName = "tiller-deploy"
|
|
|
|
|
|
|
|
secretName = "tiller-secret"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
// Uninstall uses Kubernetes client to uninstall Tiller.
|
|
|
|
// Uninstall uses Kubernetes client to uninstall Tiller.
|
|
|
@ -35,7 +36,10 @@ func Uninstall(client internalclientset.Interface, opts *Options) error {
|
|
|
|
if err := deleteService(client.Core(), opts.Namespace); err != nil {
|
|
|
|
if err := deleteService(client.Core(), opts.Namespace); err != nil {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return deleteDeployment(client, opts.Namespace)
|
|
|
|
if err := deleteDeployment(client, opts.Namespace); err != nil {
|
|
|
|
|
|
|
|
return err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return deleteSecret(client.Core(), opts.Namespace)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// deleteService deletes the Tiller Service resource
|
|
|
|
// deleteService deletes the Tiller Service resource
|
|
|
@ -53,6 +57,12 @@ func deleteDeployment(client internalclientset.Interface, namespace string) erro
|
|
|
|
return ingoreNotFound(err)
|
|
|
|
return ingoreNotFound(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// deleteSecret deletes the Tiller Secret resource
|
|
|
|
|
|
|
|
func deleteSecret(client coreclient.SecretsGetter, namespace string) error {
|
|
|
|
|
|
|
|
err := client.Secrets(namespace).Delete(secretName, &metav1.DeleteOptions{})
|
|
|
|
|
|
|
|
return ingoreNotFound(err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func ingoreNotFound(err error) error {
|
|
|
|
func ingoreNotFound(err error) error {
|
|
|
|
if apierrors.IsNotFound(err) {
|
|
|
|
if apierrors.IsNotFound(err) {
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|