default config

incubator/hnc/api/v1alpha1/hierarchy_types.go

@@ -21,8 +21,8 @@ import (
 
 // Constants for types and well-known names
 const (
-	Singleton               = "hierarchy"
-	HierarchyConfigurations = "hierarchyconfigurations"
+	Singleton = "hierarchy"
+	Resource  = "hierarchyconfigurations"
 )
 
 // Constants for labels and annotations

incubator/hnc/config/crd/kustomization.yaml

@@ -4,7 +4,6 @@
 resources:
 - bases/hnc.x-k8s.io_hierarchyconfigurations.yaml
 - bases/hnc.x-k8s.io_hncconfigurations.yaml
-- bases/hnc.x-k8s.io_hierarchicalnamespaces.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

incubator/hnc/pkg/kubectl/root.go

@@ -43,7 +43,6 @@ type realClient struct{}
 type Client interface {
 	getHierarchy(nnm string) *api.HierarchyConfiguration
 	updateHierarchy(hier *api.HierarchyConfiguration, reason string)
-	createHierarchicalNamespace(nnm string, hnnm string)
 }
 
 func init() {
@@ -88,7 +87,6 @@ func init() {
 	rootCmd.AddCommand(newDescribeCmd())
 	rootCmd.AddCommand(newTreeCmd())
 	rootCmd.AddCommand(newCreateCmd())
-	rootCmd.AddCommand(newCreate2Cmd())
 }
 
 func Execute() {
@@ -113,7 +111,7 @@ func (cl *realClient) getHierarchy(nnm string) *api.HierarchyConfiguration {
 	hier := &api.HierarchyConfiguration{}
 	hier.Name = api.Singleton
 	hier.Namespace = nnm
-	err := hncClient.Get().Resource(api.HierarchyConfigurations).Namespace(nnm).Name(api.Singleton).Do().Into(hier)
+	err := hncClient.Get().Resource(api.Resource).Namespace(nnm).Name(api.Singleton).Do().Into(hier)
 	if err != nil && !errors.IsNotFound(err) {
 		fmt.Printf("Error reading hierarchy for %s: %s\n", nnm, err)
 		os.Exit(1)
@@ -125,28 +123,16 @@ func (cl *realClient) updateHierarchy(hier *api.HierarchyConfiguration, reason s
 	nnm := hier.Namespace
 	var err error
 	if hier.CreationTimestamp.IsZero() {
-		err = hncClient.Post().Resource(api.HierarchyConfigurations).Namespace(nnm).Name(api.Singleton).Body(hier).Do().Error()
+		err = hncClient.Post().Resource(api.Resource).Namespace(nnm).Name(api.Singleton).Body(hier).Do().Error()
 	} else {
-		err = hncClient.Put().Resource(api.HierarchyConfigurations).Namespace(nnm).Name(api.Singleton).Body(hier).Do().Error()
+		err = hncClient.Put().Resource(api.Resource).Namespace(nnm).Name(api.Singleton).Body(hier).Do().Error()
 	}
 	if err != nil {
 		fmt.Printf("\nCould not %s.\nReason: %s\n", reason, err)
 		os.Exit(1)
 	}
 }
 
-func (cl *realClient) createHierarchicalNamespace(nnm string, hnnm string) {
-	hns := &api.HierarchicalNamespace{}
-	hns.Name = hnnm
-	hns.Namespace = nnm
-	err := hncClient.Post().Resource(api.HierarchicalNamespaces).Namespace(nnm).Name(hnnm).Body(hns).Do().Error()
-	if err != nil {
-		fmt.Printf("\nCould not create hierarchicalnamespace instance.\nReason: %s\n", err)
-		os.Exit(1)
-	}
-	fmt.Printf("Successfully created \"%s\" hierarchicalnamespace instance in \"%s\" namespace\n", hnnm, nnm)
-}
-
 func childNamespaceExists(hier *api.HierarchyConfiguration, cn string) bool {
 	for _, n := range hier.Spec.RequiredChildren {
 		if cn == n {