Skip to content

Commit

Permalink
remove crd readiness check (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrIncompetent committed Feb 5, 2018
1 parent 10407b0 commit eaf6772
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 29 deletions.
1 change: 0 additions & 1 deletion cmd/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ func main() {

health := healthcheck.NewHandler()
health.AddReadinessCheck("apiserver-connection", machinehealth.ApiserverReachable(kubeClient))
health.AddReadinessCheck("custom-resource-definitions-exist", machinehealth.CustomResourceDefinitionsEstablished(extclient))
for name, c := range c.ReadinessChecks() {
health.AddReadinessCheck(name, c)
}
Expand Down
17 changes: 0 additions & 17 deletions pkg/health/readiness.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package health

import (
"errors"

"github.com/heptiolabs/healthcheck"
"github.com/kubermatic/machine-controller/pkg/machines"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
)
Expand All @@ -16,16 +12,3 @@ func ApiserverReachable(client kubernetes.Interface) healthcheck.Check {
return err
}
}

func CustomResourceDefinitionsEstablished(clientset apiextensionsclient.Interface) healthcheck.Check {
return func() error {
exist, err := machines.AllCustomResourceDefinitionsExists(clientset)
if err != nil {
return err
}
if !exist {
return errors.New("custom resource definitions do not exist / are established")
}
return nil
}
}
11 changes: 0 additions & 11 deletions pkg/machines/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@ func EnsureCustomResourceDefinitions(clientset apiextensionsclient.Interface) er
return nil
}

func AllCustomResourceDefinitionsExists(clientset apiextensionsclient.Interface) (bool, error) {
for _, res := range resourceNames {
name := res.plural + "." + v1alpha1.GroupName
exists, err := CustomResourceDefinitionExists(name, clientset)
if err != nil || !exists {
return false, err
}
}
return true, nil
}

func CustomResourceDefinitionExists(name string, clientset apiextensionsclient.Interface) (bool, error) {
crd, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Get(name, metav1.GetOptions{})
if err != nil {
Expand Down

0 comments on commit eaf6772

Please sign in to comment.