Skip to content

Commit

Permalink
generate funcs, add watch, etc
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Fernandez <[email protected]>
  • Loading branch information
marioferh committed May 16, 2024
1 parent bb805d2 commit 4cbadae
Show file tree
Hide file tree
Showing 739 changed files with 69,876 additions and 232,317 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,13 @@ $(TOOLING): $(BIN_DIR)


## Tool Versions
CONTROLLER_TOOLS_VERSION ?= v0.13.0
CONTROLLER_TOOLS_VERSION ?= v0.15.0

.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. If wrong version is installed, it will be overwritten.
$(CONTROLLER_GEN): $(LOCALBIN)
test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
$(CONTROLLER_GEN): $(BIN_DIR)
test -s $(BIN_DIR)/controller-gen && $(BIN_DIR)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
GOBIN=$(BIN_DIR) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)

##@ Development

Expand Down
6 changes: 6 additions & 0 deletions cmd/operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ import (

"golang.org/x/sync/errgroup"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog/v2"

cmoscheme "github.com/openshift/cluster-monitoring-operator/pkg/generated/clientset/versioned/scheme"
"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
"github.com/openshift/cluster-monitoring-operator/pkg/metrics"
cmo "github.com/openshift/cluster-monitoring-operator/pkg/operator"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
)

type images map[string]string
Expand Down Expand Up @@ -100,6 +103,9 @@ func Main() int {
flag.Var(&images, "images", "Images to use for containers managed by the cluster-monitoring-operator.")
flag.Parse()

utilruntime.Must(cmoscheme.AddToScheme(scheme.Scheme))
//+kubebuilder:scaffold:scheme

f, err := os.Open(*telemetryConfigFile)
if err != nil {
fmt.Fprintf(os.Stderr, "Could not open telemetry config file: %v", err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.15.0
name: clustermonitoringoperators.cmo.example.com
spec:
group: cmo.example.com
Expand Down
5,116 changes: 0 additions & 5,116 deletions config/crd/bases/example.com_clustermonitoringoperators.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions config/examples/clustermonitoringoperator_copy.yaml

This file was deleted.

32 changes: 0 additions & 32 deletions config/rbac/role.yaml

This file was deleted.

62 changes: 0 additions & 62 deletions controller/clustermonitoringoperator_controller.go

This file was deleted.

84 changes: 0 additions & 84 deletions controller/clustermonitoringoperator_controller_test.go

This file was deleted.

90 changes: 0 additions & 90 deletions controller/suite_test.go

This file was deleted.

Loading

0 comments on commit 4cbadae

Please sign in to comment.