Skip to content

Commit

Permalink
chore: Sort telemetry.kyma-project.io API types (v1alpha1 and v1beta1) (
Browse files Browse the repository at this point in the history 
#1564)
  • Loading branch information
@skhalash
skhalash authored Oct 25, 2024
1 parent a3d4f8b commit 82dc218
Show file tree
Hide file tree
Showing 43 changed files with 809 additions and 826 deletions.
34 changes: 16 additions & 18 deletions apis/telemetry/v1alpha1/logparser_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// LogParserSpec defines the desired state of LogParser.
type LogParserSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file
//nolint:gochecknoinits // SchemeBuilder's registration is required.
func init() {
SchemeBuilder.Register(&LogParser{}, &LogParserList{})
}

// [Fluent Bit Parsers](https://docs.fluentbit.io/manual/pipeline/parsers). The parser specified here has no effect until it is referenced by a [Pod annotation](https://docs.fluentbit.io/manual/pipeline/filters/kubernetes#kubernetes-annotations) on your workload or by a [Parser Filter](https://docs.fluentbit.io/manual/pipeline/filters/parser) defined in a pipeline's filters section.
Parser string `json:"parser,omitempty"`
// +kubebuilder:object:root=true
// LogParserList contains a list of LogParser.
type LogParserList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []LogParser `json:"items"`
}

// +kubebuilder:object:root=true
Expand All @@ -35,7 +39,6 @@ type LogParserSpec struct {
// +kubebuilder:printcolumn:name="Agent Healthy",type=string,JSONPath=`.status.conditions[?(@.type=="AgentHealthy")].status`
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
// +kubebuilder:deprecatedversion:warning="The LogParser API is deprecated. Instead, log in JSON format and use the JSON parsing feature of the LogPipeline"

// LogParser is the Schema for the logparsers API.
type LogParser struct {
metav1.TypeMeta `json:",inline"`
Expand All @@ -46,22 +49,17 @@ type LogParser struct {
Status LogParserStatus `json:"status,omitempty"`
}

// +kubebuilder:object:root=true
// LogParserSpec defines the desired state of LogParser.
type LogParserSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file

// LogParserList contains a list of LogParser.
type LogParserList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []LogParser `json:"items"`
// [Fluent Bit Parsers](https://docs.fluentbit.io/manual/pipeline/parsers). The parser specified here has no effect until it is referenced by a [Pod annotation](https://docs.fluentbit.io/manual/pipeline/filters/kubernetes#kubernetes-annotations) on your workload or by a [Parser Filter](https://docs.fluentbit.io/manual/pipeline/filters/parser) defined in a pipeline's filters section.
Parser string `json:"parser,omitempty"`
}

// LogParserStatus shows the observed state of the LogParser.
type LogParserStatus struct {
// An array of conditions describing the status of the parser.
Conditions []metav1.Condition `json:"conditions,omitempty"`
}

//nolint:gochecknoinits // SchemeBuilder's registration is required.
func init() {
SchemeBuilder.Register(&LogParser{}, &LogParserList{})
}
46 changes: 23 additions & 23 deletions apis/telemetry/v1alpha1/logpipeline_conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (lp *LogPipeline) ConvertTo(dstRaw conversion.Hub) error {
Port: srcHTTPOutput.Port,
Compress: srcHTTPOutput.Compress,
Format: srcHTTPOutput.Format,
TLSConfig: v1Alpha1TLSToV1Beta1(srcHTTPOutput.TLSConfig),
TLSConfig: v1Alpha1TLSToV1Beta1(srcHTTPOutput.TLS),
Dedot: srcHTTPOutput.Dedot,
}
}
Expand Down Expand Up @@ -86,19 +86,19 @@ func v1Alpha1OTLPInputToV1Beta1(otlp *OTLPInput) *telemetryv1beta1.OTLPInput {
return input
}

func v1Alpha1ApplicationToV1Beta1(application *ApplicationInput) *telemetryv1beta1.LogPipelineRuntimeInput {
func v1Alpha1ApplicationToV1Beta1(application *LogPipelineApplicationInput) *telemetryv1beta1.LogPipelineRuntimeInput {
if application == nil {
return nil
}

runtime := &telemetryv1beta1.LogPipelineRuntimeInput{
Enabled: application.Enabled,
Namespaces: telemetryv1beta1.LogPipelineInputNamespaces{
Namespaces: telemetryv1beta1.LogPipelineNamespaceSelector{
Include: application.Namespaces.Include,
Exclude: application.Namespaces.Exclude,
System: application.Namespaces.System,
},
Containers: telemetryv1beta1.LogPipelineInputContainers{
Containers: telemetryv1beta1.LogPipelineContainerSelector{
Include: application.Containers.Include,
Exclude: application.Containers.Exclude,
},
Expand Down Expand Up @@ -190,7 +190,7 @@ func v1Alpha1ValueTypeToV1Beta1(src ValueType) telemetryv1beta1.ValueType {
}
}

func v1Alpha1TLSToV1Beta1(src TLSConfig) telemetryv1beta1.OutputTLS {
func v1Alpha1TLSToV1Beta1(src LogPipelineOutputTLS) telemetryv1beta1.OutputTLS {
var dst telemetryv1beta1.OutputTLS

if src.CA != nil {
Expand Down Expand Up @@ -229,24 +229,24 @@ func (lp *LogPipeline) ConvertFrom(srcRaw conversion.Hub) error {
dst.Spec.Input.OTLP = v1Beta1OTLPInputToV1Alpha1(src.Spec.Input.OTLP)

for _, f := range src.Spec.Files {
dst.Spec.Files = append(dst.Spec.Files, FileMount(f))
dst.Spec.Files = append(dst.Spec.Files, LogPipelineFileMount(f))
}

for _, f := range src.Spec.Filters {
dst.Spec.Filters = append(dst.Spec.Filters, Filter(f))
dst.Spec.Filters = append(dst.Spec.Filters, LogPipelineFilter(f))
}

if srcHTTPOutput := src.Spec.Output.HTTP; srcHTTPOutput != nil {
dst.Spec.Output.HTTP = &HTTPOutput{
Host: v1Beta1ValueTypeToV1Alpha1(srcHTTPOutput.Host),
User: v1Beta1ValueTypeToV1Alpha1(srcHTTPOutput.User),
Password: v1Beta1ValueTypeToV1Alpha1(srcHTTPOutput.Password),
URI: srcHTTPOutput.URI,
Port: srcHTTPOutput.Port,
Compress: srcHTTPOutput.Compress,
Format: srcHTTPOutput.Format,
TLSConfig: v1Beta1TLSToV1Alpha1(srcHTTPOutput.TLSConfig),
Dedot: srcHTTPOutput.Dedot,
dst.Spec.Output.HTTP = &LogPipelineHTTPOutput{
Host: v1Beta1ValueTypeToV1Alpha1(srcHTTPOutput.Host),
User: v1Beta1ValueTypeToV1Alpha1(srcHTTPOutput.User),
Password: v1Beta1ValueTypeToV1Alpha1(srcHTTPOutput.Password),
URI: srcHTTPOutput.URI,
Port: srcHTTPOutput.Port,
Compress: srcHTTPOutput.Compress,
Format: srcHTTPOutput.Format,
TLS: v1Beta1TLSToV1Alpha1(srcHTTPOutput.TLSConfig),
Dedot: srcHTTPOutput.Dedot,
}
}

Expand All @@ -270,19 +270,19 @@ func (lp *LogPipeline) ConvertFrom(srcRaw conversion.Hub) error {
return nil
}

func v1Beta1RuntimeToV1Alpha1(runtime *telemetryv1beta1.LogPipelineRuntimeInput) *ApplicationInput {
func v1Beta1RuntimeToV1Alpha1(runtime *telemetryv1beta1.LogPipelineRuntimeInput) *LogPipelineApplicationInput {
if runtime == nil {
return nil
}

application := &ApplicationInput{
application := &LogPipelineApplicationInput{
Enabled: runtime.Enabled,
Namespaces: InputNamespaces{
Namespaces: LogPipelineNamespaceSelector{
Include: runtime.Namespaces.Include,
Exclude: runtime.Namespaces.Exclude,
System: runtime.Namespaces.System,
},
Containers: InputContainers{
Containers: LogPipelineContainerSelector{
Include: runtime.Containers.Include,
Exclude: runtime.Containers.Exclude,
},
Expand Down Expand Up @@ -378,8 +378,8 @@ func v1Beta1BasicAuthOptionsToV1Alpha1(basic *telemetryv1beta1.BasicAuthOptions)
}
}

func v1Beta1TLSToV1Alpha1(src telemetryv1beta1.OutputTLS) TLSConfig {
var dst TLSConfig
func v1Beta1TLSToV1Alpha1(src telemetryv1beta1.OutputTLS) LogPipelineOutputTLS {
var dst LogPipelineOutputTLS

if src.CA != nil {
ca := v1Beta1ValueTypeToV1Alpha1(*src.CA)
Expand Down
30 changes: 15 additions & 15 deletions apis/telemetry/v1alpha1/logpipeline_conversion_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ func TestConvertTo(t *testing.T) {
Name: "log-pipeline-test",
},
Spec: LogPipelineSpec{
Input: Input{
Application: &ApplicationInput{
Input: LogPipelineInput{
Application: &LogPipelineApplicationInput{
Enabled: ptr.To(true),
Namespaces: InputNamespaces{
Namespaces: LogPipelineNamespaceSelector{
Include: []string{"default", "kube-system"},
Exclude: []string{"kube-public"},
System: true,
},
Containers: InputContainers{
Containers: LogPipelineContainerSelector{
Include: []string{"nginx", "app"},
Exclude: []string{"sidecar"},
},
Expand All @@ -41,15 +41,15 @@ func TestConvertTo(t *testing.T) {
},
},
},
Files: []FileMount{
Files: []LogPipelineFileMount{
{Name: "file1", Content: "file1-content"},
},
Filters: []Filter{
Filters: []LogPipelineFilter{
{Custom: "name stdout"},
},
Output: Output{
Output: LogPipelineOutput{
Custom: "custom-output",
HTTP: &HTTPOutput{
HTTP: &LogPipelineHTTPOutput{
Host: ValueType{
Value: "http://localhost",
},
Expand All @@ -69,7 +69,7 @@ func TestConvertTo(t *testing.T) {
Port: "8080",
Compress: "on",
Format: "json",
TLSConfig: TLSConfig{
TLS: LogPipelineOutputTLS{
SkipCertificateValidation: true,
CA: &ValueType{
Value: "ca",
Expand Down Expand Up @@ -166,12 +166,12 @@ func TestConvertFrom(t *testing.T) {
Input: telemetryv1beta1.LogPipelineInput{
Runtime: &telemetryv1beta1.LogPipelineRuntimeInput{
Enabled: ptr.To(true),
Namespaces: telemetryv1beta1.LogPipelineInputNamespaces{
Namespaces: telemetryv1beta1.LogPipelineNamespaceSelector{
Include: []string{"default", "kube-system"},
Exclude: []string{"kube-public"},
System: true,
},
Containers: telemetryv1beta1.LogPipelineInputContainers{
Containers: telemetryv1beta1.LogPipelineContainerSelector{
Include: []string{"nginx", "app"},
Exclude: []string{"sidecar"},
},
Expand Down Expand Up @@ -332,10 +332,10 @@ func requireLogPipelinesEquivalent(t *testing.T, x *LogPipeline, y *telemetryv1b
require.Equal(t, xHTTP.Port, yHTTP.Port, "HTTP port mismatch")
require.Equal(t, xHTTP.Compress, yHTTP.Compress, "HTTP compress mismatch")
require.Equal(t, xHTTP.Format, yHTTP.Format, "HTTP format mismatch")
require.Equal(t, xHTTP.TLSConfig.SkipCertificateValidation, yHTTP.TLSConfig.SkipCertificateValidation, "HTTP TLS skip certificate validation mismatch")
require.Equal(t, xHTTP.TLSConfig.CA.Value, yHTTP.TLSConfig.CA.Value, "HTTP TLS CA mismatch")
require.Equal(t, xHTTP.TLSConfig.Cert.Value, yHTTP.TLSConfig.Cert.Value, "HTTP TLS cert mismatch")
require.Equal(t, xHTTP.TLSConfig.Key.Value, yHTTP.TLSConfig.Key.Value, "HTTP TLS key mismatch")
require.Equal(t, xHTTP.TLS.SkipCertificateValidation, yHTTP.TLSConfig.SkipCertificateValidation, "HTTP TLS skip certificate validation mismatch")
require.Equal(t, xHTTP.TLS.CA.Value, yHTTP.TLSConfig.CA.Value, "HTTP TLS CA mismatch")
require.Equal(t, xHTTP.TLS.Cert.Value, yHTTP.TLSConfig.Cert.Value, "HTTP TLS cert mismatch")
require.Equal(t, xHTTP.TLS.Key.Value, yHTTP.TLSConfig.Key.Value, "HTTP TLS key mismatch")

xOTLP := x.Spec.Output.OTLP
yOTLP := y.Spec.Output.OTLP
Expand Down
Loading

0 comments on commit 82dc218

Please sign in to comment.