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

Removed use of radix-image-tag from rd in tests #1220

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Removed use of radix-image-tag from rd in tests #1220

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
4 changes: 2 additions & 2 deletions charts/radix-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: radix-operator
version: 1.45.0
appVersion: 1.65.0
version: 1.45.1
appVersion: 1.65.1
kubeVersion: ">=1.24.0"
description: Radix Operator
keywords:
Expand Down
3 changes: 0 additions & 3 deletions pipeline-runner/steps/deployconfig/step_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,9 +719,6 @@ func (s *deployConfigTestSuite) buildRadixDeployments(deploymentBuildersProps []
deploymentBuilder = deploymentBuilder.WithComponent(componentBuilder)
}
rd := deploymentBuilder.BuildRD()
labels := rd.GetLabels()
delete(labels, kube.RadixImageTagLabel) // HACK - not actually used label
rd.SetLabels(labels)
rdList = append(rdList, *rd)
}
return rdList
Expand Down
3 changes: 0 additions & 3 deletions pipeline-runner/steps/promote/step_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@ func TestPromote_PromoteToOtherEnvironment_NewStateIsExpected(t *testing.T) {
assert.Equal(t, 1, len(rds.Items))
assert.True(t, strings.HasPrefix(rds.Items[0].Name, fmt.Sprintf("%s-%s-", anyProdEnvironment, anyImageTag)))
assert.Equal(t, anyProdEnvironment, rds.Items[0].Labels[kube.RadixEnvLabel])
assert.Equal(t, anyImageTag, rds.Items[0].Labels[kube.RadixImageTagLabel])
assert.Equal(t, anyPromoteJobName, rds.Items[0].Labels[kube.RadixJobNameLabel])
assert.Equal(t, 4, *rds.Items[0].Spec.Components[0].Replicas)
assert.Equal(t, "db-prod", rds.Items[0].Spec.Components[0].EnvironmentVariables["DB_HOST"])
Expand Down Expand Up @@ -463,7 +462,6 @@ func TestPromote_PromoteToOtherEnvironment_Resources_NoOverride(t *testing.T) {
assert.Equal(t, 1, len(rds.Items))
assert.True(t, strings.HasPrefix(rds.Items[0].Name, fmt.Sprintf("%s-%s-", anyProdEnvironment, anyImageTag)))
assert.Equal(t, anyProdEnvironment, rds.Items[0].Labels[kube.RadixEnvLabel])
assert.Equal(t, anyImageTag, rds.Items[0].Labels[kube.RadixImageTagLabel])
assert.Equal(t, anyPromoteJobName, rds.Items[0].Labels[kube.RadixJobNameLabel])
assert.Equal(t, "250m", rds.Items[0].Spec.Components[0].Resources.Requests["cpu"])
assert.Equal(t, "64Mi", rds.Items[0].Spec.Components[0].Resources.Requests["memory"])
Expand Down Expand Up @@ -675,7 +673,6 @@ func TestPromote_PromoteToOtherEnvironment_Resources_WithOverride(t *testing.T)
assert.Equal(t, 1, len(rds.Items))
assert.True(t, strings.HasPrefix(rds.Items[0].Name, fmt.Sprintf("%s-%s-", anyProdEnvironment, anyImageTag)))
assert.Equal(t, anyProdEnvironment, rds.Items[0].Labels[kube.RadixEnvLabel])
assert.Equal(t, anyImageTag, rds.Items[0].Labels[kube.RadixImageTagLabel])
assert.Equal(t, anyPromoteJobName, rds.Items[0].Labels[kube.RadixJobNameLabel])
assert.Equal(t, "500m", rds.Items[0].Spec.Components[0].Resources.Requests["cpu"])
assert.Equal(t, "128Mi", rds.Items[0].Spec.Components[0].Resources.Requests["memory"])
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/utils/deployment_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ func (db *DeploymentBuilderStruct) WithLabel(label, value string) DeploymentBuil

// WithImageTag Sets deployment tag to be appended to name
func (db *DeploymentBuilderStruct) WithImageTag(imageTag string) DeploymentBuilder {
db.Labels[kube.RadixImageTagLabel] = imageTag
db.ImageTag = imageTag
return db
}
Expand Down