Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,10 @@ limitations under the License.
package main

import (
"flag"
"log"

"k8s.io/client-go/tools/clientcmd"
"knative.dev/pkg/injection/sharedmain"
"knative.dev/pkg/signals"
"knative.dev/serving-operator/pkg/reconciler/knativeserving"
)

func main() {
flag.Parse()

cfg, err := clientcmd.BuildConfigFromFlags(*knativeserving.MasterURL, *knativeserving.Kubeconfig)
if err != nil {
log.Fatal("Error building kubeconfig", err)
}
sharedmain.MainWithConfig(signals.NewContext(), "serving_operator", cfg, knativeserving.NewController)
sharedmain.Main("serving_operator", knativeserving.NewController)
}
14 changes: 4 additions & 10 deletions pkg/reconciler/knativeserving/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ package knativeserving

import (
"context"
"flag"
"os"
"path/filepath"

"github.com/go-logr/zapr"
mf "github.com/manifestival/manifestival"
"go.uber.org/zap"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/clientcmd"

deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
"knative.dev/pkg/injection/sharedmain"
"knative.dev/serving-operator/pkg/apis/serving/v1alpha1"
knativeServinginformer "knative.dev/serving-operator/pkg/client/injection/informers/serving/v1alpha1/knativeserving"
rbase "knative.dev/serving-operator/pkg/reconciler"
Expand All @@ -37,12 +37,6 @@ const (
reconcilerName = "KnativeServing"
)

var (
recursive = flag.Bool("recursive", false, "If filename is a directory, process all manifests recursively")
MasterURL = flag.String("master", "", "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.")
Kubeconfig = flag.String("kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster.")
)

// NewController initializes the controller and is called by the generated code
// Registers eventhandlers to enqueue events
func NewController(
Expand All @@ -60,13 +54,13 @@ func NewController(

koDataDir := os.Getenv("KO_DATA_PATH")

cfg, err := clientcmd.BuildConfigFromFlags(*MasterURL, *Kubeconfig)
cfg, err := sharedmain.GetConfig("", "")
if err != nil {
c.Logger.Error(err, "Error building kubeconfig")
}

mf.SetLogger(zapr.NewLogger(zap.NewExample()))
config, err := mf.NewManifest(filepath.Join(koDataDir, "knative-serving/"), *recursive, cfg)
config, err := mf.NewManifest(filepath.Join(koDataDir, "knative-serving/"), false, cfg)
if err != nil {
c.Logger.Error(err, "Error creating the Manifest for knative-serving")
os.Exit(1)
Expand Down