Use enterprise_trial as the trial license type #2934
Conversation
| var operatorNamespace string | ||
| flag.StringVar(&operatorNamespace, "operator-namespace", "elastic-system", "indicates the namespace where the operator is deployed") | ||
| flag.Parse() | ||
| licensingInfo, err := license.NewResourceReporter(newK8sClient(), operatorNamespace).Get() |
There was a problem hiding this comment.
I am not sure we need still need this tool.
There was a problem hiding this comment.
Agreed, maybe open an issue to revisit keeping it in there? I'm not sure how valuable it is
There was a problem hiding this comment.
I left it because it was handy for testing the license reporting and in case someone wanted to get it in real time but it is not documented. So I don't really see any good reason to keep it.
| c := k8s.WrapClient(client) | ||
| return ResourceReporter{ | ||
| aggregator: Aggregator{ | ||
| client: c, | ||
| }, | ||
| licensingResolver: LicensingResolver{ | ||
| client: c, | ||
| client: c, | ||
| operatorNs: operatorNs, |
There was a problem hiding this comment.
This was always "" up until now, which lead to errors now that we actually do trial license checks.
| return l.License.Type == LicenseTypeEnterpriseTrial || l.License.Type == LicenseTypeLegacyTrial | ||
| } | ||
|
|
||
| // IsECKManagedTrial returns true if this license has been generated by trial controller or is eligible to be turned into one. |
There was a problem hiding this comment.
Nit: "or is eligible to be turned into one." is kind of confusing, but I'm not sure what would be better. Maybe "or is eligible to have its license generated by the trial controller" but that still reads weird. Maybe just "or is eligible to be"? All sound a little bit off
* Introduce enterprise_trial, keep enterprise-trial for backwards compatibility * Fix license checker and add tests around the new license type * Mention trial extensions in licensing doc and use the new trial type identifier * Make sure license reporter's operator namespace is always initialised
* Introduce enterprise_trial, keep enterprise-trial for backwards compatibility * Fix license checker and add tests around the new license type * Mention trial extensions in licensing doc and use the new trial type identifier * Make sure license reporter's operator namespace is always initialised
Fixes #2915
enterprise_trialas the correct license type for trial licenses both auto-generated ones as well as externally generated onesenterprise-trialfor backwards compatibility in auto-generated trial licensesLabeled 1.1.0, but open for discussion. Happy to spin off a smaller PR if desired for 1.1.0