Merge pull request #84 from kube-logging/deprecate-loki

Deprecate loki output, add OTLPHTTP

Makefile

@@ -14,7 +14,7 @@ KIND_CLUSTER ?= kind
 CI_MODE_ENABLED := ""
 NO_KIND_CLEANUP := ""
 
-IMG ?= ghcr.io/kube-logging/telemetry-controller:0.0.10
+IMG ?= ghcr.io/kube-logging/telemetry-controller:0.0.11
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.0
 
@@ -65,6 +65,7 @@ help: ## Display this help.
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./api/..." output:crd:artifacts:config=config/crd/bases
+	cp config/crd/bases/* charts/telemetry-controller/crds/
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

api/telemetry/v1alpha1/output_types.go

@@ -28,20 +28,20 @@ type OutputSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	OTLP          *OTLP          `json:"otlp,omitempty"`
-	Loki          *Loki          `json:"loki,omitempty"`
+	OTLPGRPC      *OTLPGRPC      `json:"otlp,omitempty"`
 	Fluentforward *Fluentforward `json:"fluentforward,omitempty"`
+	OTLPHTTP      *OTLPHTTP      `json:"otlphttp,omitempty"`
 }
 
 // OTLP grpc exporter config ref: https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/otlpexporter/config.go
-type OTLP struct {
+type OTLPGRPC struct {
 	QueueConfig      QueueSettings `json:"sending_queue,omitempty" yaml:"sending_queue,omitempty"`
 	RetryConfig      BackOffConfig `json:"retry_on_failure,omitempty" yaml:"retry_on_failure,omitempty"`
 	TimeoutSettings  `json:",inline" yaml:",inline"`
 	GRPCClientConfig `json:",inline" yaml:",inline"`
 }
 
-type Loki struct {
+type OTLPHTTP struct {
 	QueueConfig      QueueSettings `json:"sending_queue,omitempty" yaml:"sending_queue,omitempty"`
 	RetryConfig      BackOffConfig `json:"retry_on_failure,omitempty" yaml:"retry_on_failure,omitempty"`
 	HTTPClientConfig `json:",inline" yaml:",inline"`