Skip to content

Commit 1533eec

Browse files
pavolloffaypavolloffay
authored
Change the v1alpha2 package to v1beta1 (#2641)
1 parent ab2c3c0 commit 1533eec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+542
-542
lines changed

‎apis/v1alpha2/allocation_strategy.go ‎apis/v1beta1/allocation_strategy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
type (
1818
// TargetAllocatorAllocationStrategy represent a strategy Target Allocator uses to distribute targets to each collector

‎apis/v1alpha2/collector_webhook.go ‎apis/v1beta1/collector_webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
import (
1818
"context"

‎apis/v1alpha2/collector_webhook_test.go ‎apis/v1beta1/collector_webhook_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
import (
1818
"testing"

‎apis/v1alpha2/common.go ‎apis/v1beta1/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
import (
1818
autoscalingv2 "k8s.io/api/autoscaling/v2"

‎apis/v1alpha2/config.go ‎apis/v1beta1/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
import (
1818
"bytes"

‎apis/v1alpha2/config_test.go ‎apis/v1beta1/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
import (
1818
"encoding/json"

‎apis/v1alpha2/groupversion_info.go ‎apis/v1beta1/groupversion_info.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// Package v1alpha2 contains API Schema definitions for the v1alpha2 API group
15+
// Package v1beta1 contains API Schema definitions for the v1beta1 API group
1616
// +kubebuilder:object:generate=true
1717
// +groupName=opentelemetry.io
18-
package v1alpha2
18+
package v1beta1
1919

2020
import (
2121
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -24,7 +24,7 @@ import (
2424

2525
var (
2626
// GroupVersion is group version used to register these objects.
27-
GroupVersion = schema.GroupVersion{Group: "opentelemetry.io", Version: "v1alpha2"}
27+
GroupVersion = schema.GroupVersion{Group: "opentelemetry.io", Version: "v1beta1"}
2828

2929
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
3030
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

‎apis/v1alpha2/ingress_type.go ‎apis/v1beta1/ingress_type.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
type (
1818
// IngressType represents how a collector should be exposed (ingress vs route).

‎apis/v1alpha2/mode.go ‎apis/v1beta1/mode.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
type (
1818
// Mode represents how the collector should be deployed (deployment vs. daemonset)

‎apis/v1alpha2/opentelemetrycollector_types.go ‎apis/v1beta1/opentelemetrycollector_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// +kubebuilder:skip
1616

17-
package v1alpha2
17+
package v1beta1
1818

1919
import (
2020
appsv1 "k8s.io/api/apps/v1"

‎apis/v1alpha2/targetallocator_types.go ‎apis/v1beta1/targetallocator_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// +kubebuilder:skip
1616

17-
package v1alpha2
17+
package v1beta1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎apis/v1alpha2/testdata/otelcol-connectors.yaml ‎apis/v1beta1/testdata/otelcol-connectors.yaml

File renamed without changes.

‎apis/v1alpha2/testdata/otelcol-couchbase.yaml ‎apis/v1beta1/testdata/otelcol-couchbase.yaml

File renamed without changes.

‎apis/v1alpha2/testdata/otelcol-demo.yaml ‎apis/v1beta1/testdata/otelcol-demo.yaml

File renamed without changes.

‎apis/v1alpha2/testdata/otelcol-extensions.yaml ‎apis/v1beta1/testdata/otelcol-extensions.yaml

File renamed without changes.

‎apis/v1alpha2/testdata/otelcol-filelog.yaml ‎apis/v1beta1/testdata/otelcol-filelog.yaml

File renamed without changes.

‎apis/v1alpha2/testdata/otelcol-null-values.yaml ‎apis/v1beta1/testdata/otelcol-null-values.yaml

File renamed without changes.

‎apis/v1alpha2/upgrade_strategy.go ‎apis/v1beta1/upgrade_strategy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v1alpha2
15+
package v1beta1
1616

1717
type (
1818
// UpgradeStrategy represents how the operator will handle upgrades to the CR when a newer version of the operator is deployed

‎apis/v1alpha2/zz_generated.deepcopy.go ‎apis/v1beta1/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/builder_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
colfeaturegate "go.opentelemetry.io/collector/featuregate"
3535

3636
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
37-
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha2"
37+
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
3838
"github.com/open-telemetry/opentelemetry-operator/internal/config"
3939
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
4040
"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
@@ -87,12 +87,12 @@ service:
8787
exporters: [logging]
8888
`
8989

90-
goodConfig := v1alpha2.Config{}
90+
goodConfig := v1beta1.Config{}
9191
err := go_yaml.Unmarshal([]byte(goodConfigYaml), &goodConfig)
9292
require.NoError(t, err)
9393
one := int32(1)
9494
type args struct {
95-
instance v1alpha2.OpenTelemetryCollector
95+
instance v1beta1.OpenTelemetryCollector
9696
}
9797
tests := []struct {
9898
name string
@@ -103,13 +103,13 @@ service:
103103
{
104104
name: "base case",
105105
args: args{
106-
instance: v1alpha2.OpenTelemetryCollector{
106+
instance: v1beta1.OpenTelemetryCollector{
107107
ObjectMeta: metav1.ObjectMeta{
108108
Name: "test",
109109
Namespace: "test",
110110
},
111-
Spec: v1alpha2.OpenTelemetryCollectorSpec{
112-
OpenTelemetryCommonFields: v1alpha2.OpenTelemetryCommonFields{
111+
Spec: v1beta1.OpenTelemetryCollectorSpec{
112+
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
113113
Image: "test",
114114
Replicas: &one,
115115
},
@@ -342,19 +342,19 @@ service:
342342
{
343343
name: "ingress",
344344
args: args{
345-
instance: v1alpha2.OpenTelemetryCollector{
345+
instance: v1beta1.OpenTelemetryCollector{
346346
ObjectMeta: metav1.ObjectMeta{
347347
Name: "test",
348348
Namespace: "test",
349349
},
350-
Spec: v1alpha2.OpenTelemetryCollectorSpec{
351-
OpenTelemetryCommonFields: v1alpha2.OpenTelemetryCommonFields{
350+
Spec: v1beta1.OpenTelemetryCollectorSpec{
351+
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
352352
Image: "test",
353353
Replicas: &one,
354354
},
355355
Mode: "deployment",
356-
Ingress: v1alpha2.Ingress{
357-
Type: v1alpha2.IngressTypeNginx,
356+
Ingress: v1beta1.Ingress{
357+
Type: v1beta1.IngressTypeNginx,
358358
Hostname: "example.com",
359359
Annotations: map[string]string{
360360
"something": "true",
@@ -627,13 +627,13 @@ service:
627627
{
628628
name: "specified service account case",
629629
args: args{
630-
instance: v1alpha2.OpenTelemetryCollector{
630+
instance: v1beta1.OpenTelemetryCollector{
631631
ObjectMeta: metav1.ObjectMeta{
632632
Name: "test",
633633
Namespace: "test",
634634
},
635-
Spec: v1alpha2.OpenTelemetryCollectorSpec{
636-
OpenTelemetryCommonFields: v1alpha2.OpenTelemetryCommonFields{
635+
Spec: v1beta1.OpenTelemetryCollectorSpec{
636+
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
637637
Image: "test",
638638
Replicas: &one,
639639
ServiceAccount: "my-special-sa",
@@ -1121,12 +1121,12 @@ service:
11211121
exporters: [logging]
11221122
`
11231123

1124-
goodConfig := v1alpha2.Config{}
1124+
goodConfig := v1beta1.Config{}
11251125
err := go_yaml.Unmarshal([]byte(goodConfigYaml), &goodConfig)
11261126
require.NoError(t, err)
11271127
one := int32(1)
11281128
type args struct {
1129-
instance v1alpha2.OpenTelemetryCollector
1129+
instance v1beta1.OpenTelemetryCollector
11301130
}
11311131
tests := []struct {
11321132
name string
@@ -1138,22 +1138,22 @@ service:
11381138
{
11391139
name: "base case",
11401140
args: args{
1141-
instance: v1alpha2.OpenTelemetryCollector{
1141+
instance: v1beta1.OpenTelemetryCollector{
11421142
ObjectMeta: metav1.ObjectMeta{
11431143
Name: "test",
11441144
Namespace: "test",
11451145
},
1146-
Spec: v1alpha2.OpenTelemetryCollectorSpec{
1147-
OpenTelemetryCommonFields: v1alpha2.OpenTelemetryCommonFields{
1146+
Spec: v1beta1.OpenTelemetryCollectorSpec{
1147+
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
11481148
Image: "test",
11491149
Replicas: &one,
11501150
},
11511151
Mode: "statefulset",
11521152
Config: goodConfig,
1153-
TargetAllocator: v1alpha2.TargetAllocatorEmbedded{
1153+
TargetAllocator: v1beta1.TargetAllocatorEmbedded{
11541154
Enabled: true,
11551155
FilterStrategy: "relabel-config",
1156-
PrometheusCR: v1alpha2.TargetAllocatorPrometheusCR{
1156+
PrometheusCR: v1beta1.TargetAllocatorPrometheusCR{
11571157
Enabled: true,
11581158
},
11591159
},
@@ -1530,21 +1530,21 @@ prometheus_cr:
15301530
{
15311531
name: "enable metrics case",
15321532
args: args{
1533-
instance: v1alpha2.OpenTelemetryCollector{
1533+
instance: v1beta1.OpenTelemetryCollector{
15341534
ObjectMeta: metav1.ObjectMeta{
15351535
Name: "test",
15361536
Namespace: "test",
15371537
},
1538-
Spec: v1alpha2.OpenTelemetryCollectorSpec{
1539-
OpenTelemetryCommonFields: v1alpha2.OpenTelemetryCommonFields{
1538+
Spec: v1beta1.OpenTelemetryCollectorSpec{
1539+
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
15401540
Image: "test",
15411541
Replicas: &one,
15421542
},
15431543
Mode: "statefulset",
15441544
Config: goodConfig,
1545-
TargetAllocator: v1alpha2.TargetAllocatorEmbedded{
1545+
TargetAllocator: v1beta1.TargetAllocatorEmbedded{
15461546
Enabled: true,
1547-
PrometheusCR: v1alpha2.TargetAllocatorPrometheusCR{
1547+
PrometheusCR: v1beta1.TargetAllocatorPrometheusCR{
15481548
Enabled: true,
15491549
},
15501550
FilterStrategy: "relabel-config",

‎internal/api/convert/v1alpha.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,37 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

2323
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
24-
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha2"
24+
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
2525
)
2626

27-
func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1alpha2.OpenTelemetryCollector, error) {
27+
func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error) {
2828
copy := in.DeepCopy()
29-
out := v1alpha2.OpenTelemetryCollector{
29+
out := v1beta1.OpenTelemetryCollector{
3030
TypeMeta: copy.TypeMeta,
3131
ObjectMeta: copy.ObjectMeta,
3232
}
3333

34-
cfg := &v1alpha2.Config{}
34+
cfg := &v1beta1.Config{}
3535
if err := yaml.Unmarshal([]byte(in.Spec.Config), cfg); err != nil {
36-
return v1alpha2.OpenTelemetryCollector{}, errors.New("could not convert config json to v1alpha2.Config")
36+
return v1beta1.OpenTelemetryCollector{}, errors.New("could not convert config json to v1beta1.Config")
3737
}
3838
out.Spec.Config = *cfg
3939

40-
out.Spec.OpenTelemetryCommonFields.ManagementState = v1alpha2.ManagementStateType(copy.Spec.ManagementState)
40+
out.Spec.OpenTelemetryCommonFields.ManagementState = v1beta1.ManagementStateType(copy.Spec.ManagementState)
4141
out.Spec.OpenTelemetryCommonFields.Resources = copy.Spec.Resources
4242
out.Spec.OpenTelemetryCommonFields.NodeSelector = copy.Spec.NodeSelector
4343
out.Spec.OpenTelemetryCommonFields.Args = copy.Spec.NodeSelector
4444
out.Spec.OpenTelemetryCommonFields.Replicas = copy.Spec.Replicas
4545

4646
if copy.Spec.Autoscaler != nil {
47-
metrics := make([]v1alpha2.MetricSpec, len(copy.Spec.Autoscaler.Metrics))
47+
metrics := make([]v1beta1.MetricSpec, len(copy.Spec.Autoscaler.Metrics))
4848
for i, m := range copy.Spec.Autoscaler.Metrics {
49-
metrics[i] = v1alpha2.MetricSpec{
49+
metrics[i] = v1beta1.MetricSpec{
5050
Type: m.Type,
5151
Pods: m.Pods,
5252
}
5353
}
54-
out.Spec.OpenTelemetryCommonFields.Autoscaler = &v1alpha2.AutoscalerSpec{
54+
out.Spec.OpenTelemetryCommonFields.Autoscaler = &v1beta1.AutoscalerSpec{
5555
MinReplicas: copy.Spec.Autoscaler.MinReplicas,
5656
MaxReplicas: copy.Spec.Autoscaler.MaxReplicas,
5757
Behavior: copy.Spec.Autoscaler.Behavior,
@@ -62,7 +62,7 @@ func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1alpha2.OpenTelemetryColl
6262
}
6363

6464
if copy.Spec.PodDisruptionBudget != nil {
65-
out.Spec.OpenTelemetryCommonFields.PodDisruptionBudget = &v1alpha2.PodDisruptionBudgetSpec{
65+
out.Spec.OpenTelemetryCommonFields.PodDisruptionBudget = &v1beta1.PodDisruptionBudgetSpec{
6666
MinAvailable: copy.Spec.PodDisruptionBudget.MinAvailable,
6767
MaxUnavailable: copy.Spec.PodDisruptionBudget.MaxUnavailable,
6868
}
@@ -96,18 +96,18 @@ func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1alpha2.OpenTelemetryColl
9696

9797
out.Spec.TargetAllocator = TargetAllocatorEmbedded(copy.Spec.TargetAllocator)
9898

99-
out.Spec.Mode = v1alpha2.Mode(copy.Spec.Mode)
100-
out.Spec.UpgradeStrategy = v1alpha2.UpgradeStrategy(copy.Spec.UpgradeStrategy)
101-
out.Spec.Ingress.Type = v1alpha2.IngressType(copy.Spec.Ingress.Type)
102-
out.Spec.Ingress.RuleType = v1alpha2.IngressRuleType(copy.Spec.Ingress.RuleType)
99+
out.Spec.Mode = v1beta1.Mode(copy.Spec.Mode)
100+
out.Spec.UpgradeStrategy = v1beta1.UpgradeStrategy(copy.Spec.UpgradeStrategy)
101+
out.Spec.Ingress.Type = v1beta1.IngressType(copy.Spec.Ingress.Type)
102+
out.Spec.Ingress.RuleType = v1beta1.IngressRuleType(copy.Spec.Ingress.RuleType)
103103
out.Spec.Ingress.Hostname = copy.Spec.Ingress.Hostname
104104
out.Spec.Ingress.Annotations = copy.Spec.Ingress.Annotations
105105
out.Spec.Ingress.TLS = copy.Spec.Ingress.TLS
106106
out.Spec.Ingress.IngressClassName = copy.Spec.Ingress.IngressClassName
107-
out.Spec.Ingress.Route.Termination = v1alpha2.TLSRouteTerminationType(copy.Spec.Ingress.Route.Termination)
107+
out.Spec.Ingress.Route.Termination = v1beta1.TLSRouteTerminationType(copy.Spec.Ingress.Route.Termination)
108108

109109
if copy.Spec.LivenessProbe != nil {
110-
out.Spec.LivenessProbe = &v1alpha2.Probe{
110+
out.Spec.LivenessProbe = &v1beta1.Probe{
111111
InitialDelaySeconds: copy.Spec.LivenessProbe.InitialDelaySeconds,
112112
TimeoutSeconds: copy.Spec.LivenessProbe.TimeoutSeconds,
113113
PeriodSeconds: copy.Spec.LivenessProbe.PeriodSeconds,
@@ -127,13 +127,13 @@ func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1alpha2.OpenTelemetryColl
127127
return out, nil
128128
}
129129

130-
func TargetAllocatorEmbedded(in v1alpha1.OpenTelemetryTargetAllocator) v1alpha2.TargetAllocatorEmbedded {
131-
out := v1alpha2.TargetAllocatorEmbedded{}
130+
func TargetAllocatorEmbedded(in v1alpha1.OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedded {
131+
out := v1beta1.TargetAllocatorEmbedded{}
132132
out.Replicas = in.Replicas
133133
out.NodeSelector = in.NodeSelector
134134
out.Resources = in.Resources
135-
out.AllocationStrategy = v1alpha2.TargetAllocatorAllocationStrategy(in.AllocationStrategy)
136-
out.FilterStrategy = v1alpha2.TargetAllocatorFilterStrategy(in.FilterStrategy)
135+
out.AllocationStrategy = v1beta1.TargetAllocatorAllocationStrategy(in.AllocationStrategy)
136+
out.FilterStrategy = v1beta1.TargetAllocatorFilterStrategy(in.FilterStrategy)
137137
out.ServiceAccount = in.ServiceAccount
138138
out.Image = in.Image
139139
out.Enabled = in.Enabled
@@ -158,7 +158,7 @@ func TargetAllocatorEmbedded(in v1alpha1.OpenTelemetryTargetAllocator) v1alpha2.
158158
MatchLabels: in.PrometheusCR.ServiceMonitorSelector,
159159
}
160160
if in.PodDisruptionBudget != nil {
161-
out.PodDisruptionBudget = &v1alpha2.PodDisruptionBudgetSpec{
161+
out.PodDisruptionBudget = &v1beta1.PodDisruptionBudgetSpec{
162162
MinAvailable: in.PodDisruptionBudget.MinAvailable,
163163
MaxUnavailable: in.PodDisruptionBudget.MaxUnavailable,
164164
}

0 commit comments

Comments
 (0)