Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix apiVersion and kind are missing in jaeger-operator generate output #2281

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Fix apiVersion and kind are missing in jaeger-operator generate output #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/cronjob/es_index_cleaner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ func CreateEsIndexCleaner(jaeger *v1.Jaeger) runtime.Object {
cronjobsVersion := viper.GetString(v1.FlagCronJobsVersion)
if cronjobsVersion == v1.FlagCronJobsVersionBatchV1Beta1 {
cj := &batchv1beta1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectmeta,
Spec: batchv1beta1.CronJobSpec{
Schedule: jaeger.Spec.Storage.EsIndexCleaner.Schedule,
Expand All @@ -118,6 +122,10 @@ func CreateEsIndexCleaner(jaeger *v1.Jaeger) runtime.Object {
o = cj
} else {
cj := &batchv1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectmeta,
Spec: batchv1.CronJobSpec{
Schedule: jaeger.Spec.Storage.EsIndexCleaner.Schedule,
Expand Down
33 changes: 33 additions & 0 deletions pkg/cronjob/es_index_cleaner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/stretchr/testify/assert"

batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -39,6 +40,38 @@ func TestCreateEsIndexCleaner(t *testing.T) {
assert.Equal(t, historyLimits, *cronJob.Spec.SuccessfulJobsHistoryLimit)
}

func TestCreateEsIndexCleanerTypeMeta(t *testing.T) {
testData := []struct {
Name string
flag string
}{
{Name: "Test batch/v1beta1", flag: v1.FlagCronJobsVersionBatchV1Beta1},
{Name: "Test batch/v1", flag: v1.FlagCronJobsVersionBatchV1},
}

jaeger := &v1.Jaeger{Spec: v1.JaegerSpec{Storage: v1.JaegerStorageSpec{Options: v1.NewOptions(
map[string]interface{}{"es.index-prefix": "tenant1", "es.server-urls": "http://nowhere:666,foo"})}}}
days := 0
jaeger.Spec.Storage.EsIndexCleaner.NumberOfDays = &days
historyLimits := int32(1)
jaeger.Spec.Storage.EsIndexCleaner.SuccessfulJobsHistoryLimit = &historyLimits
for _, td := range testData {
if td.flag == v1.FlagCronJobsVersionBatchV1Beta1 {
viper.SetDefault(v1.FlagCronJobsVersion, v1.FlagCronJobsVersionBatchV1Beta1)
}
cronJobs := CreateEsIndexCleaner(jaeger)
switch tt := cronJobs.(type) {
case *batchv1beta1.CronJob:
assert.Equal(t, tt.Kind, "CronJob")
assert.Equal(t, tt.APIVersion, v1.FlagCronJobsVersionBatchV1Beta1)
viper.SetDefault(v1.FlagCronJobsVersion, v1.FlagCronJobsVersionBatchV1)
case *batchv1.CronJob:
assert.Equal(t, tt.Kind, "CronJob")
assert.Equal(t, tt.APIVersion, v1.FlagCronJobsVersionBatchV1)
}
}
}

func TestEsIndexCleanerSecrets(t *testing.T) {
jaeger := v1.NewJaeger(types.NamespacedName{Name: "TestEsIndexCleanerSecrets"})
secret := "mysecret"
Expand Down
16 changes: 16 additions & 0 deletions pkg/cronjob/es_rollover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ func rollover(jaeger *v1.Jaeger) runtime.Object {
cronjobsVersion := viper.GetString(v1.FlagCronJobsVersion)
if cronjobsVersion == v1.FlagCronJobsVersionBatchV1Beta1 {
cj := &batchv1beta1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectMeta,
Spec: batchv1beta1.CronJobSpec{
ConcurrencyPolicy: batchv1beta1.ForbidConcurrent,
Expand All @@ -70,6 +74,10 @@ func rollover(jaeger *v1.Jaeger) runtime.Object {
o = cj
} else {
cj := &batchv1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectMeta,
Spec: batchv1.CronJobSpec{
ConcurrencyPolicy: batchv1.ForbidConcurrent,
Expand Down Expand Up @@ -158,6 +166,10 @@ func lookback(jaeger *v1.Jaeger) runtime.Object {
cronjobsVersion := viper.GetString(v1.FlagCronJobsVersion)
if cronjobsVersion == v1.FlagCronJobsVersionBatchV1Beta1 {
cj := &batchv1beta1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectMeta,
Spec: batchv1beta1.CronJobSpec{
ConcurrencyPolicy: batchv1beta1.ForbidConcurrent,
Expand All @@ -174,6 +186,10 @@ func lookback(jaeger *v1.Jaeger) runtime.Object {
o = cj
} else {
cj := &batchv1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectMeta,
Spec: batchv1.CronJobSpec{
ConcurrencyPolicy: batchv1.ForbidConcurrent,
Expand Down
29 changes: 29 additions & 0 deletions pkg/cronjob/es_rollover_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"time"

batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"

"github.com/jaegertracing/jaeger-operator/pkg/version"

Expand All @@ -29,6 +30,34 @@ func TestCreateRollover(t *testing.T) {
assert.Equal(t, 2, len(cj))
}

func TestCreateRolloverTypeMeta(t *testing.T) {
testData := []struct {
Name string
flag string
}{
{Name: "Test batch/v1beta1", flag: v1.FlagCronJobsVersionBatchV1Beta1},
{Name: "Test batch/v1", flag: v1.FlagCronJobsVersionBatchV1},
}
for _, td := range testData {
if td.flag == v1.FlagCronJobsVersionBatchV1Beta1 {
viper.SetDefault(v1.FlagCronJobsVersion, v1.FlagCronJobsVersionBatchV1Beta1)
}
cjs := CreateRollover(v1.NewJaeger(types.NamespacedName{Name: "pikachu"}))
assert.Equal(t, 2, len(cjs))
for _, cj := range cjs {
switch tt := cj.(type) {
case *batchv1beta1.CronJob:
assert.Equal(t, tt.Kind, "CronJob")
assert.Equal(t, tt.APIVersion, v1.FlagCronJobsVersionBatchV1Beta1)
viper.SetDefault(v1.FlagCronJobsVersion, v1.FlagCronJobsVersionBatchV1)
case *batchv1.CronJob:
assert.Equal(t, tt.Kind, "CronJob")
assert.Equal(t, tt.APIVersion, v1.FlagCronJobsVersionBatchV1)
}
}
}
}

func TestRollover(t *testing.T) {
j := v1.NewJaeger(types.NamespacedName{Name: "eevee"})
j.Namespace = "kitchen"
Expand Down
8 changes: 8 additions & 0 deletions pkg/cronjob/spark_dependencies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ func CreateSparkDependencies(jaeger *v1.Jaeger) runtime.Object {
cronjobsVersion := viper.GetString(v1.FlagCronJobsVersion)
if cronjobsVersion == v1.FlagCronJobsVersionBatchV1Beta1 {
cj := &batchv1beta1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectMeta,
Spec: batchv1beta1.CronJobSpec{
ConcurrencyPolicy: batchv1beta1.ForbidConcurrent,
Expand All @@ -130,6 +134,10 @@ func CreateSparkDependencies(jaeger *v1.Jaeger) runtime.Object {
o = cj
} else {
cj := &batchv1.CronJob{
TypeMeta: metav1.TypeMeta{
Kind: "CronJob",
APIVersion: cronjobsVersion,
},
ObjectMeta: objectMeta,
Spec: batchv1.CronJobSpec{
ConcurrencyPolicy: batchv1.ForbidConcurrent,
Expand Down
27 changes: 27 additions & 0 deletions pkg/cronjob/spark_dependencies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"

"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -134,6 +135,32 @@ func TestCreate(t *testing.T) {
assert.NotNil(t, CreateSparkDependencies(&v1.Jaeger{Spec: v1.JaegerSpec{Storage: v1.JaegerStorageSpec{Type: v1.JaegerESStorage}}}))
}

func TestCreateTypeMeta(t *testing.T) {
testData := []struct {
Name string
flag string
}{
{Name: "Test batch/v1beta1", flag: v1.FlagCronJobsVersionBatchV1Beta1},
{Name: "Test batch/v1", flag: v1.FlagCronJobsVersionBatchV1},
}
for _, td := range testData {
if td.flag == v1.FlagCronJobsVersionBatchV1Beta1 {
viper.SetDefault(v1.FlagCronJobsVersion, v1.FlagCronJobsVersionBatchV1Beta1)
}
sd := CreateSparkDependencies(&v1.Jaeger{Spec: v1.JaegerSpec{Storage: v1.JaegerStorageSpec{Type: v1.JaegerESStorage}}})
assert.NotNil(t, sd)
switch tt := sd.(type) {
case *batchv1beta1.CronJob:
assert.Equal(t, tt.Kind, "CronJob")
assert.Equal(t, tt.APIVersion, v1.FlagCronJobsVersionBatchV1Beta1)
viper.SetDefault(v1.FlagCronJobsVersion, v1.FlagCronJobsVersionBatchV1)
case *batchv1.CronJob:
assert.Equal(t, tt.Kind, "CronJob")
assert.Equal(t, tt.APIVersion, v1.FlagCronJobsVersionBatchV1)
}
}
}

func TestSparkDependenciesSecrets(t *testing.T) {
jaeger := v1.NewJaeger(types.NamespacedName{Name: "TestSparkDependenciesSecrets"})
secret := "mysecret"
Expand Down
8 changes: 8 additions & 0 deletions pkg/deployment/autoscale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ func autoscalers(component component) []runtime.Object {

if autoscalingVersion == v1.FlagAutoscalingVersionV2Beta2 {
autoscaler := autoscalingv2beta2.HorizontalPodAutoscaler{
TypeMeta: metav1.TypeMeta{
Kind: "HorizontalPodAutoscaler",
APIVersion: autoscalingVersion,
},
ObjectMeta: metav1.ObjectMeta{
Name: component.name(),
Namespace: jaeger.Namespace,
Expand Down Expand Up @@ -119,6 +123,10 @@ func autoscalers(component component) []runtime.Object {
result = append(result, &autoscaler)
} else {
autoscaler := autoscalingv2.HorizontalPodAutoscaler{
TypeMeta: metav1.TypeMeta{
Kind: "HorizontalPodAutoscaler",
APIVersion: autoscalingVersion,
},
ObjectMeta: metav1.ObjectMeta{
Name: component.name(),
Namespace: jaeger.Namespace,
Expand Down
Loading