Swap out cmo dependency for local structs

Signed-off-by: Philip Gough <[email protected]>
stolostron · Jul 24, 2024 · 99316ab · 99316ab
1 parent ac37411
commit 99316ab
Show file tree

Hide file tree

Showing 10 changed files with 617 additions and 1,888 deletions.
diff --git a/go.mod b/go.mod
@@ -20,7 +20,6 @@ require (
 	github.com/onsi/gomega v1.32.0
 	github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
 	github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
-	github.com/openshift/cluster-monitoring-operator v0.0.0-20230118025836-20fcb9f6ef4e
 	github.com/openshift/hypershift v0.1.11
 	github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c
 	github.com/prometheus-community/prom-label-proxy v0.8.1-0.20240127162815-c1195f9aabc0
@@ -44,6 +43,7 @@ require (
 	k8s.io/api v0.30.0
 	k8s.io/apiextensions-apiserver v0.30.0
 	k8s.io/apimachinery v0.30.0
+	k8s.io/apiserver v0.30.0
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.29.3
@@ -172,10 +172,8 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.30.0 // indirect
 	k8s.io/component-base v0.30.0 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-aggregator v0.29.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20240403164606-bc84c2ddaf99 // indirect
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
 	open-cluster-management.io/sdk-go v0.13.1-0.20240416030555-aa744f426379 // indirect

diff --git a/go.sum b/go.sum
diff --git a/operators/endpointmetrics/Dockerfile b/operators/endpointmetrics/Dockerfile
@@ -7,6 +7,7 @@ COPY go.sum go.mod ./
 COPY ./operators/endpointmetrics ./operators/endpointmetrics
 COPY ./operators/multiclusterobservability/api ./operators/multiclusterobservability/api
 COPY ./operators/pkg ./operators/pkg
+COPY ./pkg ./pkg
 
 RUN CGO_ENABLED=1 go build -a -installsuffix cgo -o build/_output/bin/endpoint-monitoring-operator operators/endpointmetrics/main.go
 

diff --git a/operators/endpointmetrics/controllers/observabilityendpoint/ocp_monitoring_config.go b/operators/endpointmetrics/controllers/observabilityendpoint/ocp_monitoring_config.go
@@ -18,8 +18,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/ghodss/yaml"
-	cmomanifests "github.com/openshift/cluster-monitoring-operator/pkg/manifests"
 	operatorconfig "github.com/stolostron/multicluster-observability-operator/operators/pkg/config"
+	cmomanifests "github.com/stolostron/multicluster-observability-operator/pkg/cmo"
 )
 
 const (

diff --git a/operators/endpointmetrics/controllers/observabilityendpoint/ocp_monitoring_config_test.go b/operators/endpointmetrics/controllers/observabilityendpoint/ocp_monitoring_config_test.go
@@ -19,9 +19,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	yamltool "github.com/ghodss/yaml"
-	cmomanifests "github.com/openshift/cluster-monitoring-operator/pkg/manifests"
-
 	operatorconfig "github.com/stolostron/multicluster-observability-operator/operators/pkg/config"
+	cmomanifests "github.com/stolostron/multicluster-observability-operator/pkg/cmo"
+
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/operators/multiclusterobservability/Containerfile.operator b/operators/multiclusterobservability/Containerfile.operator
@@ -7,6 +7,7 @@ WORKDIR /workspace
 COPY go.sum go.mod ./
 COPY ./operators/multiclusterobservability ./operators/multiclusterobservability
 COPY ./operators/pkg ./operators/pkg
+COPY ./pkg ./pkg
 
 RUN CGO_ENABLED=1 GOFLAGS="" go build -a -installsuffix cgo -o bin/manager operators/multiclusterobservability/main.go
 

diff --git a/operators/multiclusterobservability/Dockerfile b/operators/multiclusterobservability/Dockerfile
@@ -7,6 +7,7 @@ WORKDIR /workspace
 COPY go.sum go.mod ./
 COPY ./operators/multiclusterobservability ./operators/multiclusterobservability
 COPY ./operators/pkg ./operators/pkg
+COPY ./pkg ./pkg
 
 RUN CGO_ENABLED=1 go build -a -installsuffix cgo -o bin/manager operators/multiclusterobservability/main.go
 

diff --git a/operators/multiclusterobservability/Dockerfile.dev b/operators/multiclusterobservability/Dockerfile.dev
@@ -6,6 +6,7 @@ WORKDIR /workspace
 COPY go.sum go.mod ./
 COPY ./operators/multiclusterobservability ./operators/multiclusterobservability
 COPY ./operators/pkg ./operators/pkg
+COPY ./pkg ./pkg
 
 RUN CGO_ENABLED=1 go build -a -installsuffix cgo -o bin/manager operators/multiclusterobservability/main.go
 

diff --git a/operators/multiclusterobservability/controllers/placementrule/hub_ocp_monitoring_util.go b/operators/multiclusterobservability/controllers/placementrule/hub_ocp_monitoring_util.go
@@ -11,10 +11,10 @@ import (
 	"reflect"
 
 	"github.com/ghodss/yaml"
-	cmomanifests "github.com/openshift/cluster-monitoring-operator/pkg/manifests"
 	hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
 	promv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	operatorconfig "github.com/stolostron/multicluster-observability-operator/operators/pkg/config"
+	cmomanifests "github.com/stolostron/multicluster-observability-operator/pkg/cmo"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/pkg/cmo/api.go b/pkg/cmo/api.go