Port 12682 support new provisioning on k8s-exporter #94
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shalev007
approved these changes
Jan 27, 2025
pkg/defaults/init.go
Outdated
Comment on lines
28
to
47
| if applicationConfig.CreatePortResourcesOrigin == port.CreatePortResourcesOriginPort { | ||
| klog.Info("Resources origin is set to be Port, verifying integration is supported") | ||
| featureFlags, err := org_details.GetOrganizationFeatureFlags(portClient) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| hasProvisionedDefaultsFlag := false | ||
| for _, flag := range featureFlags { | ||
| if flag == port.OrgUseProvisionedDefaultsFeatureFlag { | ||
| hasProvisionedDefaultsFlag = true | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if !hasProvisionedDefaultsFlag { | ||
| klog.Info("Port origin for Integration is not supported, changing resources origin to use K8S") | ||
| applicationConfig.CreatePortResourcesOrigin = port.CreatePortResourcesOriginK8S | ||
| } | ||
| } |
There was a problem hiding this comment.
Can you put that in a different function, it could be something generic like isFeatureFalgSupported
pkg/defaults/init.go
Outdated
| @@ -38,7 +61,8 @@ func InitIntegration(portClient *cli.PortClient, applicationConfig *port.Config) | |||
| } | |||
|
|
|||
| klog.Warningf("Could not get integration with state key %s, error: %s", applicationConfig.StateKey, err.Error()) | |||
| if err := integration.CreateIntegration(portClient, applicationConfig.StateKey, applicationConfig.EventListenerType, defaultIntegrationConfig); err != nil { | |||
| _, err := integration.CreateIntegration(portClient, applicationConfig.StateKey, applicationConfig.EventListenerType, defaultIntegrationConfig, applicationConfig.CreatePortResourcesOrigin == port.CreatePortResourcesOriginPort) | |||
There was a problem hiding this comment.
you could use a helper variable here instead of evaluating twice
shouldCreateResourcesUsingPort = applicationConfig.CreatePortResourcesOrigin == port.CreatePortResourcesOriginPort
razsamuel
force-pushed
the
PORT-12682_support_provisioning_on_exporter
branch
from
8ffeacc to
a91b2de
Compare
razsamuel
commented
Jan 28, 2025
pkg/defaults/init.go
Outdated
| @@ -47,7 +80,7 @@ func InitIntegration(portClient *cli.PortClient, applicationConfig *port.Config) | |||
| EventListener: getEventListenerConfig(applicationConfig.EventListenerType), | |||
| } | |||
|
|
|||
| if existingIntegration.Config == nil || applicationConfig.OverwriteConfigurationOnRestart { | |||
| if (existingIntegration.Config == nil || applicationConfig.OverwriteConfigurationOnRestart) && !(applicationConfig.CreatePortResourcesOrigin == port.CreatePortResourcesOriginPort) { | |||
razsamuel
commented
Jan 30, 2025
| @@ -47,7 +80,7 @@ func InitIntegration(portClient *cli.PortClient, applicationConfig *port.Config) | |||
| EventListener: getEventListenerConfig(applicationConfig.EventListenerType), | |||
| } | |||
|
|
|||
| if existingIntegration.Config == nil || applicationConfig.OverwriteConfigurationOnRestart { | |||
| if (existingIntegration.Config == nil && !(applicationConfig.CreatePortResourcesOrigin == port.CreatePortResourcesOriginPort)) || applicationConfig.OverwriteConfigurationOnRestart { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
What - Added support to create resources on port by default
Why - Support onboarding experience
How - Decide which logic to execute by port FF
Type of change
Please leave one option from the following and delete the rest: