Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cli/internal/operator/ssa/apply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestVersionFromEmbeddedChartMatchesChartAppVersion(t *testing.T) {
// Tracks charts/yacd/Chart.yaml appVersion; bump alongside an operator
// release re-sync. This is the tripwire that the embedded chart copy is in
// sync with the pinned release.
assert.Equal(t, "v0.1.1", version)
assert.Equal(t, "v0.2.0", version)
assert.True(t, semver.IsValid(version), "embedded version must be valid semver")
}

Expand Down
10 changes: 5 additions & 5 deletions cli/internal/operator/ssa/install_envtest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestEnsureOperatorInstallsFromEmbeddedChart(t *testing.T) {
require.NoError(t, err)

assert.True(t, state.Installed, "manager Deployment should exist")
assert.Equal(t, "v0.1.1", state.Version, "version read from the manager Deployment label")
assert.Equal(t, "v0.2.0", state.Version, "version read from the manager Deployment label")
// envtest has no kube-controller-manager, so the Deployment never becomes
// Available; live readiness is proven by the P6 k3d e2e, not here.
assert.False(t, state.Ready, "envtest cannot make a Deployment Available")
Expand Down Expand Up @@ -86,7 +86,7 @@ func TestEnsureOperatorIsIdempotent(t *testing.T) {
state, err := inst.EnsureOperator(ctx, operator.InstallSpec{})
require.NoError(t, err, "re-apply of an equal version must be a no-op")
assert.True(t, state.Installed)
assert.Equal(t, "v0.1.1", state.Version)
assert.Equal(t, "v0.2.0", state.Version)
}

func TestEnsureOperatorPrunesStrayManagedObject(t *testing.T) {
Expand Down Expand Up @@ -144,7 +144,7 @@ func TestPlanOnEmptyClusterReportsInstallAndMutatesNothing(t *testing.T) {
decision, err := inst.Plan(ctx, operator.InstallSpec{})
require.NoError(t, err)
assert.Equal(t, operator.ActionInstall, decision.Action)
assert.Equal(t, "v0.1.1", decision.TargetVersion)
assert.Equal(t, "v0.2.0", decision.TargetVersion)
assert.Empty(t, decision.InstalledVersion, "nothing is installed yet")

// And it applied nothing: no manager Deployment and no CRD exist afterward.
Expand Down Expand Up @@ -173,7 +173,7 @@ func TestPlanRefusesNewerInstalledVersionWithoutMutating(t *testing.T) {
require.ErrorIs(t, err, operator.ErrNewerOperator)
assert.Equal(t, operator.ActionRefuse, decision.Action)
assert.Equal(t, "v0.9.9", decision.InstalledVersion)
assert.Equal(t, "v0.1.1", decision.TargetVersion)
assert.Equal(t, "v0.2.0", decision.TargetVersion)

// Plan did not touch the seeded Deployment: its version label still reads the
// newer value, proving Plan never re-applied the embedded manifest set.
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestEnsureOperatorNamespaceFlexibility(t *testing.T) {
state, err := inst.EnsureOperator(ctx, operator.InstallSpec{Namespace: ns})
require.NoError(t, err)
assert.True(t, state.Installed)
assert.Equal(t, "v0.1.1", state.Version)
assert.Equal(t, "v0.2.0", state.Version)

// Namespaced objects land in the requested namespace.
deployment := &appsv1.Deployment{}
Expand Down