Skip to content

Add CalicoEnterprise variant and deprecate TigeraSecureEnterprise#4607

Open
caseydavenport wants to merge 5 commits intotigera:masterfrom
caseydavenport:casey-calico-enterprise-variant
Open

Add CalicoEnterprise variant and deprecate TigeraSecureEnterprise#4607
caseydavenport wants to merge 5 commits intotigera:masterfrom
caseydavenport:casey-calico-enterprise-variant

Conversation

@caseydavenport
Copy link
Copy Markdown
Member

This adds CalicoEnterprise as a new ProductVariant value that's logically equivalent to the existing TigeraSecureEnterprise. The old value still works, but is now marked as deprecated — users setting variant: TigeraSecureEnterprise will see a deprecation warning on tigerastatus pointing them to use CalicoEnterprise instead.

To support both values without duplicating checks everywhere, this adds an IsEnterprise() method on ProductVariant and replaces all the direct == TigeraSecureEnterprise / != TigeraSecureEnterprise comparisons with it. Also takes the opportunity to clean up some legacy naming — DefaultTSEEInstanceKeyDefaultEnterpriseInstanceKey, and various "TSEE" references in comments and docs → "enterprise".

No user-facing behavior changes — TigeraSecureEnterprise continues to work as before.

Introduce CalicoEnterprise as the preferred ProductVariant value for
enterprise installations, replacing the legacy TigeraSecureEnterprise
name. Both values remain accepted for backwards compatibility.

- Add IsEnterprise() method on ProductVariant so callers don't need to
  check for both values individually
- Replace all direct == TigeraSecureEnterprise comparisons with
  IsEnterprise() across controllers and render packages
- Rename DefaultTSEEInstanceKey to DefaultEnterpriseInstanceKey
- Update TSEE references in comments and docs to say "enterprise"
- Add deprecation warning on tigerastatus when TigeraSecureEnterprise
  is used
- Regenerate CRDs to include CalicoEnterprise in the enum
}
if variant != operatorv1.TigeraSecureEnterprise {
r.status.SetDegraded(operatorv1.ResourceNotReady, fmt.Sprintf("Waiting for network to be %s", operatorv1.TigeraSecureEnterprise), nil, reqLogger)
if !variant.IsEnterprise() {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eeek, next PR is going to be to replace "network" with "Installation"

Update all test files and docs to use CalicoEnterprise instead of the
deprecated TigeraSecureEnterprise constant. This fixes staticcheck
SA1019 warnings from the linter.
Not ready to surface this warning to users yet.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants