Internal flag #530
Internal flag #530
Conversation
WalkthroughThe changes involve substantial modifications to the application specifications, specifically enhancing ingress handling and hostname validation within the Skiperator framework. The Changes
Sequence Diagram(s)sequenceDiagram
participant User
participant Application
participant IngressHandler
User->>Application: Update Application Spec
Application->>IngressHandler: Process Ingresses
IngressHandler->>Application: Return Updated Ingresses
Application-->>User: Application Updated
Possibly related PRs
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 14
Outside diff range, codebase verification and nitpick comments (4)
tests/routing/internal-flag/routing-internal-flag.yaml (1)
8-15: Routes configuration is well-defined.The
routessection is correctly structured withpathPrefix,targetApp, andrewriteUrifor each route. This setup ensures that requests are appropriately routed and handled. Consider adding comments to describe each route's purpose or specific configuration nuances for future maintainability.pkg/util/helperfunctions.go (1)
20-21: Potential issues with removed functionIsInternal.The function
IsInternalis still referenced in several files, which suggests that its removal might have left unresolved dependencies or broken functionality. Please review the following locations to ensure that the necessary changes have been made to accommodate the removal ofIsInternal:
api/v1alpha1/hosts.goapi/v1alpha1/application_types.goAnalysis chain
Verify the impact of removed functions.
The removal of functions like
IsInternal,GetSecret,GetService, andErrIsMissingOrNilsuggests a significant refactoring. It's crucial to ensure that their functionalities have been replaced or are no longer needed.Run the following script to check for any remaining references to these functions, which could indicate unresolved dependencies:
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Check for any remaining references to removed functions. # Test: Search for the removed functions. Expect: No occurrences. rg --type go -A 5 $'IsInternal|GetSecret|GetService|ErrIsMissingOrNil'Length of output: 3428
api/v1alpha1/routing_types.go (1)
44-46: Field addition is well-implemented.The addition of the
Internalfield to theRoutingSpecstruct is implemented correctly with appropriate use of pointer for optional field and JSON serialization tags. However, it would be beneficial to add documentation comments above the field to explain its usage and impact, especially since it influences routing behavior.Consider adding a documentation comment for the
Internalfield to enhance code readability and maintainability.config/crd/skiperator.kartverket.no_applications.yaml (1)
649-649: Consider the implications of allowing unknown fields in the CRD.The introduction of
x-kubernetes-preserve-unknown-fields: trueat line 649 allows for greater flexibility by preserving unknown fields. This change aligns with the PR's objective to provide more dynamic ingress configurations. However, it also means that the CRD will no longer strictly validate the fields against its schema, which could lead to potential issues with data integrity and error handling.It's important to ensure that the applications interacting with this CRD are capable of handling unexpected fields gracefully and that adequate validation is implemented at the application level to maintain data integrity.
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (19)
- api/v1alpha1/application_types.go (2 hunks)
- api/v1alpha1/hosts.go (5 hunks)
- api/v1alpha1/routing_types.go (1 hunks)
- api/v1alpha1/zz_generated.deepcopy.go (2 hunks)
- config/crd/skiperator.kartverket.no_applications.yaml (1 hunks)
- config/crd/skiperator.kartverket.no_routings.yaml (1 hunks)
- pkg/resourcegenerator/deployment/deployment.go (1 hunks)
- pkg/resourcegenerator/istio/gateway/application.go (2 hunks)
- pkg/resourcegenerator/istio/gateway/routing.go (2 hunks)
- pkg/resourcegenerator/networkpolicy/dynamic/common.go (4 hunks)
- pkg/resourcegenerator/networkpolicy/dynamic/routing.go (2 hunks)
- pkg/util/helperfunctions.go (3 hunks)
- tests/application/ingress/application-is-internal-vanity-assert.yaml (1 hunks)
- tests/application/ingress/application-is-internal-vanity.yaml (1 hunks)
- tests/application/ingress/chainsaw-test.yaml (1 hunks)
- tests/routing/internal-flag/application.yaml (1 hunks)
- tests/routing/internal-flag/chainsaw-test.yaml (1 hunks)
- tests/routing/internal-flag/routing-internal-flag-assert.yaml (1 hunks)
- tests/routing/internal-flag/routing-internal-flag.yaml (1 hunks)
Additional context used
yamllint
tests/application/ingress/application-is-internal-vanity.yaml
[error] 10-10: no new line character at the end of file
(new-line-at-end-of-file)
tests/routing/internal-flag/routing-internal-flag-assert.yaml
[error] 94-94: no new line character at the end of file
(new-line-at-end-of-file)
Additional comments not posted (27)
tests/application/ingress/application-is-internal-vanity.yaml (1)
1-10: Review of New Kubernetes Application ConfigurationThis new file defines a Kubernetes application named
internalvanitywith specific ingress settings that include aninternalflag set totrue. This aligns well with the PR's objective to simplify ingress configuration management. The structure and properties used are consistent with the Skiperator framework's standards.
- Correctness: The YAML syntax is correct, and the properties are appropriately defined.
- Consistency: The use of
internal: trueis consistent with the PR's goal to differentiate between internal and external ingress configurations.- Best Practices: It's recommended to add a newline at the end of the file to comply with YAML file standards and to avoid parsing issues with certain tools.
Tools
yamllint
[error] 10-10: no new line character at the end of file
(new-line-at-end-of-file)
tests/routing/internal-flag/routing-internal-flag.yaml (2)
1-5: Overall structure and metadata are correctly defined.The
apiVersion,kind, andmetadatasections are appropriately set up for the intended Kubernetes resource configuration.
6-7: Correct implementation of theinternalflag.The addition of the
internalflag at line 7 aligns with the PR's objectives to streamline ingress configuration toggling. This is a crucial enhancement for better managing internal vs. external routing.tests/routing/internal-flag/application.yaml (2)
1-15: YAML structure and definitions are correct.The YAML structure for defining the applications
app-1andapp-2is correctly formatted according to the Kubernetes and Skiperator framework standards. The use ofapiVersion,kind,metadata, andspecis appropriate for the described resources.
1-15: Verify the integration of the new internal flag.The file defines two applications (
app-1andapp-2) with their respective images and ports. However, the PR objectives mention the introduction of a new flag for internal and external ingress configurations, which is not visible in this file. It's crucial to ensure that this flag is integrated correctly elsewhere in the codebase or in the configuration files.tests/routing/internal-flag/chainsaw-test.yaml (2)
3-9: Metadata and Spec Configuration ApprovedThe metadata and spec configuration are correctly set up for the test scenario. The use of a specific namespace for the test ensures proper isolation and management of test resources.
10-18: Steps Configuration ApprovedThe steps for applying configurations and assertions are well-organized and logical. It is important to ensure that the referenced YAML files (
application.yaml,routing-internal-flag.yaml, androuting-internal-flag-assert.yaml) are correctly set up to reflect the intended test scenarios.Please verify the contents of the referenced YAML files to ensure they align with the test objectives.
tests/application/ingress/application-is-internal-vanity-assert.yaml (3)
1-8: Gateway Configuration: ApprovedThe Gateway configuration is correctly set up for internal ingress management, aligning with the PR's objectives. The naming and selector labels are appropriately configured for internal use.
9-25: NetworkPolicy Configuration: ApprovedThe NetworkPolicy configuration is correctly set up to manage ingress for internal applications. The use of
namespaceSelectorandpodSelectoris consistent with Kubernetes best practices and aligns with the PR's objectives.
26-46: Verify Duplicate Naming in NetworkPolicyThe second NetworkPolicy configuration includes port and protocol specifications, which are correctly set up. However, it shares the same name as the first NetworkPolicy,
internalvanity. Please verify if this is intentional to complement different conditions or if it should be renamed to avoid potential conflicts.tests/application/ingress/chainsaw-test.yaml (1)
58-62: Review of the new test block for internal vanity configurations.The addition of this new test block is consistent with the rest of the file and follows the established pattern of
createandassertactions. This block is designed to test the internal vanity configurations, aligning with the PR's objective to enhance ingress configuration testing.
- File References: The files
application-is-internal-vanity.yamlandapplication-is-internal-vanity-assert.yamlare correctly referenced in thecreateandassertactions respectively. Ensure these files are correctly set up and contain the expected configurations and assertions.- Consistency Check: The naming convention and structure of the new test block are consistent with other blocks in the file, which helps maintain readability and understandability of the test configurations.
pkg/resourcegenerator/istio/gateway/routing.go (1)
50-50: Verify compatibility of the updated argument withGetIstioGatewayLabelSelector.The argument passed to
util.GetIstioGatewayLabelSelectorhas been changed fromh.Hostnameto the entirehobject. Ensure thatGetIstioGatewayLabelSelectoris updated to handle this new argument type effectively:Verification successful
Verified: The argument change to
GetIstioGatewayLabelSelectoris compatible.The function
GetIstioGatewayLabelSelectoris designed to accept a*v1alpha1.Hostobject, and the logic within the function supports this type. The change fromh.Hostnametohis consistent with the function's expected input and behavior. No further issues are found.
- Location of function:
pkg/util/helperfunctions.goScripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the implementation of `GetIstioGatewayLabelSelector` to ensure it handles the `h` object. # Test: Search for the function implementation. Expect: Function should handle properties of `h` object. ast-grep --lang go --pattern $'func GetIstioGatewayLabelSelector(h $_) { $$$ }'Length of output: 82
Script:
#!/bin/bash # Description: Search for the `GetIstioGatewayLabelSelector` function by name across the entire codebase. # Test: Locate the function definition by name. rg 'func GetIstioGatewayLabelSelector' -A 5Length of output: 432
tests/routing/internal-flag/routing-internal-flag-assert.yaml (2)
1-24: Verify domain and credential names.The configuration uses
example.comand a specificcredentialName. Please confirm:
- If
example.comis intended as a placeholder or if it should be parameterized.- The validity of the
credentialNamein the context of your deployment.
26-73: LGTM!The VirtualService configuration is well-defined and supports the PR's objectives by routing internal applications effectively.
pkg/resourcegenerator/networkpolicy/dynamic/routing.go (1)
59-59: Review the dynamic handling of MatchLabels.The code now uses the
hvariable to dynamically set theMatchLabelsfor thePodSelector. This change likely improves the flexibility of the network policy generation by allowing dynamic host information to influence the policy configuration.Ensure that the
GetIstioGatewayLabelSelectorfunction is robust and can handle any potential edge cases or errors that might arise from using dynamic host information. Consider adding unit tests to verify the behavior of this function whenhis in various states (e.g., null, missing fields, etc.).+// Ensure robustness in dynamic label selection +if h == nil { + return fmt.Errorf("host information is missing") +}This additional error check can prevent runtime errors if
his not properly initialized.pkg/resourcegenerator/istio/gateway/application.go (2)
Line range hint
9-39: Good practices in error handling and logging.The function uses
fmt.Errorfwith%wto wrap errors, which is a best practice in Go for error handling. This allows errors to be unwrapped later if needed. Additionally, the use of structured logging withctxLog.Debughelps in debugging and maintaining the code.
40-40: Verify the impact of the change on label selector determination.The change from passing
h.Hostnameto passing the entirehobject toGetIstioGatewayLabelSelectorcould potentially alter the behavior of the function, depending on how it processes the input. This needs to be verified to ensure that the label selectors are being determined correctly and that this change aligns with the intended functionality.Run the following script to verify the function usage:
Verification successful
Verification successful: Change to
GetIstioGatewayLabelSelectoris consistent and correct.The modification to pass the entire
hobject toGetIstioGatewayLabelSelectoraligns with the function's signature and logic, which relies solely on theInternalfield of theHostobject. This change is consistent across the codebase and does not affect the function's behavior. No further action is required.
- The function
GetIstioGatewayLabelSelectoris correctly used with the expected input type.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the behavior of `GetIstioGatewayLabelSelector` with the new input. # Test: Search for the function usage. Expect: Only occurrences of the new signature. rg --type go -A 5 $'GetIstioGatewayLabelSelector'Length of output: 1923
api/v1alpha1/hosts.go (4)
19-19: Approval of the newInternalfield in theHoststruct.The addition of the
Internalboolean field to theHoststruct is a clear and straightforward way to mark hosts as internal or external based on the new validation logic. This change aligns with the PR's objectives to streamline ingress configuration management.
57-57: EnsureInternalfield is set correctly inNewHost.The
Internalfield is set based on theIsInternalfunction directly within theNewHostfunction. This is a good use of encapsulation, ensuring that every new host is immediately classified upon creation.
114-116: Approval of theIsInternalfunction implementation.The
IsInternalfunction is implemented correctly to utilize theinternalPatternfor matching hostnames. This function is crucial for the new functionality introduced in this PR.
71-77: Review changes toAddObjectmethod inHostCollection.The method
AddObjectnow explicitly requires theinternalparameter to set theInternalfield of aHostinstance. This change enhances the control over host categorization but introduces redundancy since theInternalfield is already set within theNewHostfunction.Consider removing the redundant setting of the
Internalfield in theAddObjectmethod to avoid potential inconsistencies:-func (hs *HostCollection) AddObject(hostname string, internal bool) error { +func (hs *HostCollection) AddObject(hostname string) error { h, err := NewHost(hostname) if err != nil { return err } - h.Internal = internal existingValue, alreadyPresent := hs.hosts[h.Hostname] switch alreadyPresent { case true: if existingValue.UsesCustomCert() { return fmt.Errorf("host '%s' is already defined and using a custom certificate", existingValue.Hostname) } fallthrough case false: fallthrough default: hs.hosts[h.Hostname] = h } return nil }Likely invalid or redundant comment.
pkg/util/helperfunctions.go (1)
20-21: Approved: Updated function signature and logic.The changes to
GetIstioGatewayLabelSelectorimprove the function's clarity and maintainability by directly using theHoststruct. This approach is more robust as it leverages the structured data.Ensure that all references to this function have been updated to pass the
Hoststruct instead of a string. This can be verified by searching the codebase for old function calls.Verification successful
Verified: Function usage is consistent with the new signature.
The variable
hin all instances is derived from methods that return a type compatible with*v1alpha1.Host, ensuring that the updated function signature is correctly implemented across the codebase. No further changes are necessary.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify all function calls to `GetIstioGatewayLabelSelector` match the new signature. # Test: Search for the function usage. Expect: Only occurrences of the new signature. rg --type go -A 5 $'GetIstioGatewayLabelSelector'Length of output: 1923
Script:
#!/bin/bash # Description: Verify the type of variable `h` in the files where `GetIstioGatewayLabelSelector` is called. # Check the type of `h` in `pkg/resourcegenerator/networkpolicy/dynamic/routing.go` rg --type go -A 10 'GetIstioGatewayLabelSelector' pkg/resourcegenerator/networkpolicy/dynamic/routing.go # Check the type of `h` in `pkg/resourcegenerator/istio/gateway/routing.go` rg --type go -A 10 'GetIstioGatewayLabelSelector' pkg/resourcegenerator/istio/gateway/routing.go # Check the type of `h` in `pkg/resourcegenerator/istio/gateway/application.go` rg --type go -A 10 'GetIstioGatewayLabelSelector' pkg/resourcegenerator/istio/gateway/application.goLength of output: 1114
Script:
#!/bin/bash # Description: Trace the declaration or initialization of `h` to confirm its type. # Search for the declaration or initialization of `h` in `pkg/resourcegenerator/networkpolicy/dynamic/routing.go` rg --type go -B 10 'h' pkg/resourcegenerator/networkpolicy/dynamic/routing.go # Search for the declaration or initialization of `h` in `pkg/resourcegenerator/istio/gateway/routing.go` rg --type go -B 10 'h' pkg/resourcegenerator/istio/gateway/routing.go # Search for the declaration or initialization of `h` in `pkg/resourcegenerator/istio/gateway/application.go` rg --type go -B 10 'h' pkg/resourcegenerator/istio/gateway/application.goLength of output: 6839
config/crd/skiperator.kartverket.no_routings.yaml (1)
48-49: Addition ofinternalproperty to CRD schema.The addition of the
internalboolean property is correctly implemented within thespecschema. This property allows for toggling between internal and external ingress configurations, aligning with the PR's objectives to streamline ingress settings management.
- Correct Placement: The property is appropriately placed within the
specproperties, alongsidehostnameandredirectToHTTPS, which are related to ingress configurations.- Correct Type: The property type is correctly set as
boolean, which is suitable for a flag that toggles between two states.pkg/resourcegenerator/deployment/deployment.go (1)
207-216: Verify the integration of new hostname fetching logic.The integration of the new method for fetching hostnames (
application.Spec.Hosts()) and setting deployment annotations based on these hostnames (ingresses[0]) is crucial. It's important to verify that this new logic integrates well with the rest of the system, especially considering the changes in how hostnames are retrieved and used.Run the following script to verify the integration of the new hostname fetching logic:
Verification successful
Integration of New Hostname Fetching Logic Verified
The integration of the new hostname fetching logic using
application.Spec.Hosts()has been verified. The logic correctly sets deployment annotations based on the fetched hostnames. Specifically, the first hostname is used to set theAnnotationKeyLinkPrefixannotation if available. No issues were found with this integration.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the integration of the new hostname fetching logic. # Test: Search for the function usage. Expect: Only occurrences of the new signature. rg --type go -A 5 $'application.Spec.Hosts()'Length of output: 3237
Script:
#!/bin/bash # Search for the usage of `ingresses` in the deployment.go file to verify how it is used. rg --type go -A 5 'ingresses' pkg/resourcegenerator/deployment/deployment.goLength of output: 361
api/v1alpha1/application_types.go (1)
435-438: Introduction of theIngressesstruct.The new
Ingressesstruct, which includesHostnameandInternalfields, provides a structured way to represent ingress entries. This is a positive change as it enhances the clarity and expressiveness of the ingress data.This struct effectively encapsulates the necessary details for ingress configurations, making the data easier to manage and use within the system.
api/v1alpha1/zz_generated.deepcopy.go (2)
80-81: Review ofApplicationSpec.DeepCopyIntochanges: Correct handling ofv1.JSONtype.The modification to handle the
Ingressesfield as av1.JSONtype is correctly implemented. The new instance is properly created, and theDeepCopyIntomethod is invoked to ensure a deep copy of the JSON data. This change aligns with the PR's goal to handle more complex ingress configurations.
498-502: Review ofRoutingSpec.DeepCopyIntochanges: Proper management ofInternalfield.The addition of handling for the
Internalfield as a pointer to a boolean is correctly implemented. The new boolean pointer is properly created, and its value is correctly duplicated. This enhancement ensures that theInternalflag's state is accurately maintained during deep copy operations, supporting the PR's objectives to manage internal and external ingress configurations more effectively.
There was a problem hiding this comment.
Actionable comments posted: 0
Outside diff range, codebase verification and nitpick comments (1)
api/v1alpha1/application_types.go (1)
440-450: LGTM, but consider improving the function signature and error handling.The
MarshalledIngressesfunction is a utility function that marshals the providedingressesparameter into JSON format. It is used in theHostsmethod to handle the marshaling of ingress configurations.Consider the following improvements:
- Use a more specific type instead of
interface{}for theingressesparameter to improve type safety and clarity.- Return the error to the caller to enable better error handling and logging.
For example:
func MarshalledIngresses(ingresses Ingresses) (*apiextensionsv1.JSON, error) { ingressesJSON := &apiextensionsv1.JSON{} ingressesJSON.Raw, err := json.Marshal(ingresses) if err != nil { return nil, err } return ingressesJSON, nil }
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (10)
- api/v1alpha1/application_types.go (3 hunks)
- api/v1alpha1/hosts.go (5 hunks)
- pkg/resourcegenerator/deployment/deployment.go (1 hunks)
- pkg/resourcegenerator/istio/gateway/application.go (2 hunks)
- pkg/resourcegenerator/istio/gateway/routing.go (3 hunks)
- pkg/resourcegenerator/networkpolicy/dynamic/routing.go (3 hunks)
- pkg/resourcegenerator/resourceutils/helpers.go (2 hunks)
- pkg/util/helperfunctions.go (3 hunks)
- tests/routing/internal-flag/routing-internal-flag-assert.yaml (1 hunks)
- tests/routing/internal-flag/routing-internal-flag.yaml (1 hunks)
Files skipped from review as they are similar to previous changes (6)
- api/v1alpha1/hosts.go
- pkg/resourcegenerator/deployment/deployment.go
- pkg/resourcegenerator/istio/gateway/routing.go
- pkg/resourcegenerator/networkpolicy/dynamic/routing.go
- tests/routing/internal-flag/routing-internal-flag-assert.yaml
- tests/routing/internal-flag/routing-internal-flag.yaml
Additional comments not posted (6)
pkg/resourcegenerator/resourceutils/helpers.go (1)
21-26: LGTM!The code changes are approved.
pkg/resourcegenerator/istio/gateway/application.go (1)
41-41: LGTM!The code changes are approved.
pkg/util/helperfunctions.go (1)
17-17: Reminder: Address TODO comment.The TODO comment is still present, indicating that the cleanup task is pending.
api/v1alpha1/application_types.go (3)
329-332: LGTM!The new
Ingressesstruct provides a structured format for representing ingress configurations, with fields for specifying the hostname and whether it is internal. This struct is used in conjunction with the change in theApplicationSpecstruct to enable the new ingress configuration format.
453-479: LGTM!The modifications to the
Hostsmethod enable it to handle both the old string format and the new object format for ingress configurations. The method first attempts to unmarshal theIngressesJSON into a slice of strings, and if that fails, it tries to unmarshal into a slice ofIngressesstructs. This dual approach ensures backward compatibility with the previous string format while supporting the new structured format.The method also includes improved error handling by collecting and returning any errors encountered during the unmarshaling process.
70-70: LGTM, but verify the impact on existing deployments and configurations.The change in the
Ingressesfield type from[]stringto*apiextensionsv1.JSONallows for a more flexible representation of ingress configurations, enabling the use of both string and object formats. This aligns with the PR objectives.Ensure that this change is thoroughly tested and validated:
- Confirm that it behaves as expected.
- Verify that all existing deployments and configurations are properly migrated or remain compatible.
Consider running the following script to identify any occurrences of the old
Ingressesformat usage across the codebase:Verification successful
Verification Successful: No references to the old
Ingressesformat found.The transition from the
Ingressesfield type[]stringto*apiextensionsv1.JSONappears to be complete, with no remaining references to the old format in the codebase or documentation. This suggests that the change has been fully integrated without issues.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Search for usage of the old `Ingresses` format of type `[]string`. # Test: Search for the old `Ingresses` format usage. Expect: Only occurrences in test files or examples. rg --type go -A 5 $'Ingresses:\s*\[\]string'Length of output: 45
Script:
#!/bin/bash # Description: Search for any documentation or comments that might reference the old `Ingresses` format of type `[]string`. # Test: Search for comments or documentation mentioning `Ingresses` with `[]string`. rg --type go -A 5 '//.*Ingresses.*\[\]string' || rg --type md 'Ingresses.*\[\]string'Length of output: 86
There was a problem hiding this comment.
Actionable comments posted: 4
Outside diff range and nitpick comments (1)
tests/routing/internal-flag/chainsaw-test.yaml (1)
17-17: Add a new line at the end of the file.To improve readability and compatibility with various tools, it's recommended to add a new line at the end of the file.
Add a new line at the end of the file:
file: routing-internal-flag-assert.yaml +Tools
yamllint
[error] 17-17: no new line character at the end of file
(new-line-at-end-of-file)
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (9)
- api/v1alpha1/application_types.go (4 hunks)
- tests/application/internal-flag/application-internal-flag-assert.yaml (1 hunks)
- tests/application/internal-flag/application-internal-flag.yaml (1 hunks)
- tests/application/internal-flag/application-internal-missing-internal-flag-assert.yaml (1 hunks)
- tests/application/internal-flag/application-internal-missing-internal-flag-ext-assert.yaml (1 hunks)
- tests/application/internal-flag/application-internal-missing-internal-flag-ext.yaml (1 hunks)
- tests/application/internal-flag/application-internal-missing-internal-flag.yaml (1 hunks)
- tests/application/internal-flag/chainsaw-test.yaml (1 hunks)
- tests/routing/internal-flag/chainsaw-test.yaml (1 hunks)
Additional context used
yamllint
tests/routing/internal-flag/chainsaw-test.yaml
[error] 17-17: no new line character at the end of file
(new-line-at-end-of-file)
Additional comments not posted (19)
tests/application/internal-flag/application-internal-flag.yaml (1)
1-10: LGTM! The internal flag is a valuable addition to the ingress configuration.The introduction of the
internalflag in the ingress configuration provides a clear and explicit way to define internal applications. This enhancement offers several benefits:
- It improves security by restricting access to the application and controlling network traffic.
- It provides a straightforward mechanism to differentiate between internal and external applications.
- It eliminates the need for relying on regex patterns or other indirect methods to manage internal/external configurations.
The YAML structure adheres to the Kubernetes resource definition standards, ensuring compatibility and ease of deployment.
Great work on implementing this feature!
tests/routing/internal-flag/chainsaw-test.yaml (3)
1-2: LGTM!The API version and kind are correctly specified for the Chainsaw test configuration.
3-4: LGTM!The metadata is correctly specified, and the name "routes" is appropriate for a test that validates routing configurations.
5-17: LGTM!The test execution parameters and steps are correctly specified and well-structured. The choice of YAML files for applying configurations and asserting the expected outcomes is appropriate for testing the routing internal flag functionality.
Tools
yamllint
[error] 17-17: no new line character at the end of file
(new-line-at-end-of-file)
tests/application/internal-flag/chainsaw-test.yaml (3)
11-15: LGTM!The step correctly applies the internal flag configuration and asserts its correctness.
16-20: LGTM!The step correctly tests the scenario where an internal flag is missing and validates the expected outcome.
21-25: LGTM!The step correctly patches the configuration and asserts the expected results.
tests/application/internal-flag/application-internal-flag-assert.yaml (3)
1-24: LGTM!The Gateway configuration looks good:
- It correctly selects the
istio-ingress-internalapp for traffic routing.- The HTTP and HTTPS server configurations are correct.
- The TLS settings use a
SIMPLEmode with acredentialNamesecret.
26-54: LGTM!The VirtualService configuration looks good:
- The namespace exports are correct for the internal routing use case.
- The Gateway reference is correct.
- The redirect from HTTP to HTTPS is a good security practice.
- The default route to the application service is correct.
56-76: LGTM!The NetworkPolicy configuration looks good:
- The ingress traffic restriction to the
istio-ingress-internalpods is correct for the internal routing use case.- The port and protocol settings match the application service configuration.
- The pod selector correctly targets the application pods.
tests/application/internal-flag/application-internal-missing-internal-flag-ext-assert.yaml (3)
1-24: LGTM!The Gateway resource is correctly configured for external access to the application. It properly defines the HTTP and HTTPS protocols on ports 80 and 443, and includes a valid TLS configuration for secure connections.
26-54: LGTM!The VirtualService resource is correctly configured to route traffic to the application. It properly implements a redirect from HTTP to HTTPS for specific paths and allows default routing to the application on port 8000.
56-76: LGTM!The NetworkPolicy resource is correctly configured to restrict ingress traffic to the application. It properly allows connections only from pods labeled as
istio-ingress-externalwithin theistio-gatewaysnamespace.tests/application/internal-flag/application-internal-missing-internal-flag-assert.yaml (3)
1-23: LGTM!The Gateway resource is correctly defined with appropriate selector, server configurations, and TLS settings for secure communication.
26-54: LGTM!The VirtualService resource is correctly defined with appropriate exportTo, gateways, hosts, and HTTP routes for traffic management and secure communication.
56-76: LGTM!The NetworkPolicy resource is correctly defined with appropriate podSelector, ingress rules, and ports to restrict traffic to the application pods from the internal Istio ingress only.
api/v1alpha1/application_types.go (3)
330-333: LGTM!The
Ingressesstruct is well-defined and aligns with the PR objective. TheHostnameandInternalfields provide a clear structure for representing ingress configurations.
71-71: Review the change to theIngressesfield inApplicationSpec.The change from a slice of strings to a pointer to a JSON object (
*apiextensionsv1.JSON) for theIngressesfield is significant. This modification allows for a more complex and flexible representation of ingress data, which aligns with the PR's objectives to handle ingress configurations more effectively.However, this change raises a few concerns:
- Backward Compatibility: Ensure that existing deployments that use the old string format are still supported or properly migrated.
- Validation and Error Handling: The use of a JSON object increases the complexity of input validation and error handling. It's crucial to ensure that these aspects are thoroughly addressed to prevent runtime errors.
Consider adding more robust validation logic and error handling to manage the complexities introduced by this change. Also, ensure backward compatibility is maintained or provide a clear migration path for existing configurations.
8-8: LGTM!The import statement for the
utilpackage is necessary to support the changes made in the file. It is correctly added and there are no issues with it.
tests/application/internal-flag/application-internal-missing-internal-flag-ext.yaml
Outdated
Show resolved
Hide resolved
tests/application/internal-flag/application-internal-missing-internal-flag.yaml
Show resolved
Hide resolved
There was a problem hiding this comment.
Actionable comments posted: 7
Outside diff range and nitpick comments (2)
tests/application/telemetry/application.yaml (1)
6-6: Update theimageproperty with the actual container image name.The
imageproperty is currently set to a placeholder valueimage. Please update it with the actual container image name to be used for deployment.tests/skipjob/telemetry/skipjob.yaml (1)
12-12: Add a new line at the end of the file.The static analysis tool
yamllinthas flagged that the file is missing a new line character at the end. While this is a minor formatting issue and does not affect the functionality, it is considered a best practice to include a new line at the end of files.Please add a new line at the end of the file to address this:
- "-wle" - "print bpi(2000)" +Tools
yamllint
[error] 12-12: no new line character at the end of file
(new-line-at-end-of-file)
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
Files selected for processing (50)
- .github/workflows/api-docs.yaml (1 hunks)
- .github/workflows/build-and-deploy.yaml (1 hunks)
- .github/workflows/deploy-sandbox-dispatch.yaml (1 hunks)
- .github/workflows/release-version.yaml (1 hunks)
- .github/workflows/test.yml (2 hunks)
- .gitignore (1 hunks)
- .goreleaser.yaml (3 hunks)
- Dockerfile (1 hunks)
- Dockerfile.goreleaser (1 hunks)
- README.md (2 hunks)
- api/v1alpha1/application_types.go (5 hunks)
- api/v1alpha1/istiotypes/istio_settings.go (1 hunks)
- api/v1alpha1/istiotypes/zz_generated.deepcopy.go (1 hunks)
- api/v1alpha1/skipjob_types.go (4 hunks)
- api/v1alpha1/skipns_types.go (1 hunks)
- api/v1alpha1/skipobj_interfaces.go (2 hunks)
- api/v1alpha1/zz_generated.deepcopy.go (6 hunks)
- config/crd/skiperator.kartverket.no_applications.yaml (2 hunks)
- config/crd/skiperator.kartverket.no_routings.yaml (2 hunks)
- config/crd/skiperator.kartverket.no_skipjobs.yaml (2 hunks)
- config/rbac/role.yaml (2 hunks)
- go.mod (8 hunks)
- internal/controllers/application.go (5 hunks)
- internal/controllers/skipjob.go (5 hunks)
- pkg/resourcegenerator/istio/telemetry/telemetry.go (1 hunks)
- pkg/resourcegenerator/job/job.go (1 hunks)
- pkg/resourcegenerator/networkpolicy/dynamic/common.go (6 hunks)
- pkg/resourceschemas/schemas.go (4 hunks)
- pkg/util/constants.go (1 hunks)
- tests/application/access-policy/chainsaw-test.yaml (1 hunks)
- tests/application/access-policy/multiple-ns-same-label-assert.yaml (1 hunks)
- tests/application/cloudsql-auth-proxy/application-no-cloudsql-patch.yaml (0 hunks)
- tests/application/cloudsql-auth-proxy/application.yaml (0 hunks)
- tests/application/telemetry/application-assert.yaml (1 hunks)
- tests/application/telemetry/application-custom-tracing-assert.yaml (1 hunks)
- tests/application/telemetry/application-custom-tracing.yaml (1 hunks)
- tests/application/telemetry/application.yaml (1 hunks)
- tests/application/telemetry/chainsaw-test.yaml (1 hunks)
- tests/skipjob/access-policy-job/chainsaw-test.yaml (1 hunks)
- tests/skipjob/access-policy-job/skipjob-cron-assert.yaml (1 hunks)
- tests/skipjob/access-policy-job/status-ready-no-job-assert.yaml (1 hunks)
- tests/skipjob/access-policy-job/status-ready-no-job.yaml (1 hunks)
- tests/skipjob/cron-job-timezone/chainsaw-test.yaml (1 hunks)
- tests/skipjob/cron-job-timezone/skipjob-assert.yaml (1 hunks)
- tests/skipjob/cron-job-timezone/skipjob.yaml (1 hunks)
- tests/skipjob/telemetry/chainsaw-test.yaml (1 hunks)
- tests/skipjob/telemetry/skipjob-assert.yaml (1 hunks)
- tests/skipjob/telemetry/skipjob-custom-tracing-assert.yaml (1 hunks)
- tests/skipjob/telemetry/skipjob-custom-tracing.yaml (1 hunks)
- tests/skipjob/telemetry/skipjob.yaml (1 hunks)
Files not reviewed due to no reviewable changes (2)
- tests/application/cloudsql-auth-proxy/application-no-cloudsql-patch.yaml
- tests/application/cloudsql-auth-proxy/application.yaml
Files skipped from review due to trivial changes (3)
- api/v1alpha1/istiotypes/zz_generated.deepcopy.go
- api/v1alpha1/skipns_types.go
- tests/application/access-policy/multiple-ns-same-label-assert.yaml
Files skipped from review as they are similar to previous changes (2)
- config/crd/skiperator.kartverket.no_applications.yaml
- config/crd/skiperator.kartverket.no_routings.yaml
Additional context used
yamllint
tests/skipjob/telemetry/skipjob.yaml
[error] 12-12: no new line character at the end of file
(new-line-at-end-of-file)
actionlint
.github/workflows/api-docs.yaml
22-22: shellcheck reported issue in this script: SC2046:warning:1:20: Quote this to prevent word splitting
(shellcheck)
22-22: shellcheck reported issue in this script: SC2046:warning:1:29: Quote this to prevent word splitting
(shellcheck)
22-22: shellcheck reported issue in this script: SC2086:info:1:46: Double quote to prevent globbing and word splitting
(shellcheck)
GitHub Check: Build and run tests
api/v1alpha1/application_types.go
[failure] 463-463:
MarshalledIngresses redeclared in this block
[failure] 451-451:
other declaration of MarshalledIngresses
Additional comments not posted (105)
tests/application/telemetry/application.yaml (1)
1-7: LGTM! TheApplicationresource is well-structured.The YAML configuration follows the expected structure for defining an application resource in the Skiperator framework. The
apiVersion,kind,metadata, andspecfields are properly defined..gitignore (1)
10-11: LGTM!The change to the Istio-related ignore pattern refines the exclusion criteria to only ignore files starting with "istio-" while still allowing any directory named "istio" to be included.
This may result in some previously ignored files (those starting with "istio" but not followed by a hyphen) being included in the repository, which seems to be the intended behavior for more specific control over Istio-related files.
The change does not appear to have any negative impact on the repository.
tests/application/telemetry/application-custom-tracing.yaml (1)
1-11: LGTM!The YAML configuration file is well-structured and correctly defines an Istio-based application with custom tracing settings. The random sampling percentage of 75% is appropriately configured to enable monitoring and debugging of the application.
This setup is crucial for gaining insights into application performance and behavior in a microservices architecture. The changes are approved.
tests/skipjob/telemetry/skipjob.yaml (1)
1-12: LGTM! The file introduces a new resource type for running jobs.The
skipjob.yamlfile correctly defines a Kubernetes custom resource of kindSKIPJobunder theskiperator.kartverket.no/v1alpha1API version. The resource specifies a minimal job configuration that runs a Perl command to calculate the value of π (pi) to 2000 decimal places.The file structure follows the standard conventions for defining Kubernetes resources, with appropriate sections for
apiVersion,kind,metadata, andspec. Thespecsection correctly specifies the container image and command to execute.Overall, this file serves as a good example of how to define and run jobs using the Skiperator framework.
Tools
yamllint
[error] 12-12: no new line character at the end of file
(new-line-at-end-of-file)
Dockerfile.goreleaser (1)
1-11: LGTM!The Dockerfile follows best practices for building minimal and secure container images:
- It uses a multi-stage build process to keep the final image size small.
- The
scratchimage ensures that only the necessary components are included in the final image.- Copying the CA certificates allows the application to make secure network connections.
- Running as a non-root user is a good security practice.
- The
ENTRYPOINTdirective correctly specifies the command to run when the container starts.Great job on implementing a clean and efficient Dockerfile!
tests/skipjob/cron-job-timezone/chainsaw-test.yaml (1)
1-14: LGTM!The test configuration follows the Chainsaw framework's structure and conventions. The file is well-structured and easy to understand. The test's execution parameters and steps are correctly defined.
Dockerfile (1)
1-1: Verify compatibility with Go 1.23 and update dependencies if needed.Upgrading to Go 1.23 can potentially introduce improvements, optimizations, and new features that could enhance the build process and the resulting application. However, it's important to ensure that the application code and dependencies are fully compatible with the new Go version.
Please run the following script to verify the compatibility and update dependencies if necessary:
Verification successful
Dockerfile change to Go 1.23 is compatible and appropriate
The update to
FROM golang:1.23 as builderin the Dockerfile is verified to be compatible with the project:
- The
go.modfile already specifies Go 1.23.1 as the required version.- No build constraints or version-specific imports were found in the codebase.
- The Makefile doesn't contain any conflicting Go version specifications.
This change aligns the Dockerfile with the project's existing Go version requirement and should not introduce any compatibility issues.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify compatibility with Go 1.23 and update dependencies. # Test: Check if the application builds successfully with Go 1.23. make # Test: Run the application tests to ensure compatibility. make test # Test: Update dependencies to the latest versions compatible with Go 1.23. go get -u ./... go mod tidyLength of output: 336
Script:
#!/bin/bash # List the project structure echo "Project Structure:" tree -L 2 # Search for Go-specific files echo -e "\nGo-specific files:" fd -e go -e mod -e sum # Look for Go 1.23 specific syntax or features echo -e "\nSearching for Go 1.23 specific syntax or features:" rg -i "go 1\.23" --type go # Check for documentation mentioning Go version requirements echo -e "\nChecking documentation for Go version requirements:" rg -i "go (version|1\.23)" README.md CHANGELOG.md docs/Length of output: 5462
Script:
#!/bin/bash # Check go.mod for Go version requirement echo "Go version requirement in go.mod:" grep -i "go 1\." go.mod # Check for build constraints echo -e "\nChecking for build constraints:" rg -i "^//\s*\+build\s+" --type go # Check for version-specific imports echo -e "\nChecking for version-specific imports:" rg -i "^import\s+.*go1\." --type go # Check Makefile for any Go version specifications echo -e "\nChecking Makefile for Go version specifications:" grep -i "go1\." MakefileLength of output: 499
tests/skipjob/cron-job-timezone/skipjob.yaml (6)
1-2: LGTM!The API version and kind are correctly specified for the SKIPJob resource.
3-4: LGTM!The metadata is correctly defined, and the resource name is descriptive.
5-7: LGTM!The container specification is correctly defined, and the Perl image version is appropriate.
8-12: LGTM!The command is correctly defined, and the Perl script is using appropriate flags and modules to compute π (pi) to a high precision.
15-15: LGTM!The timezone is correctly defined, ensuring that the job runs according to the local time in Oslo, Norway.
1-15: LGTM!The overall YAML structure and indentation are correct, and the SKIPJob resource is properly defined with the required fields.
tests/skipjob/telemetry/skipjob-custom-tracing.yaml (1)
1-16: LGTM!The
SKIPJobresource configuration is valid and should work as expected. The job is correctly defined with a descriptive name, valid Perl image version, and a Perl one-liner command that computes and prints the value of π (pi) to 2000 decimal places. The Istio settings for telemetry are also correctly specified, enabling tracing with a 75% random sampling percentage.tests/skipjob/access-policy-job/status-ready-no-job.yaml (4)
1-2: LGTM!The
apiVersionandkindare correctly specified for aSKIPJobresource.
3-4: LGTM!The
metadata.nameuniquely identifies the job and follows the naming convention for Kubernetes resources.
6-11: Verify the allowed external host.The
accessPolicysection correctly defines the allowed external host asdata.helsecert.no. However, please verify that this host is intended and secure.
12-19: LGTM!The
spec.cronandspec.jobsections are correctly configured:
- The job is scheduled to run daily at 6 AM and allows concurrent executions.
- The job has a backoff limit of 6 retries and a TTL of 3600 seconds after completion.
- The job is not suspended, allowing it to run as scheduled.
tests/skipjob/telemetry/skipjob-assert.yaml (1)
1-15: LGTM!The Istio telemetry configuration is well-structured and follows best practices:
- The
apiVersionandkindfields are correctly specified for an Istio telemetry resource.- The
metadata.namefield provides a unique name for the resource.- The
spec.tracingsection configures the OpenTelemetry tracing provider with a reasonable 10% random sampling percentage, which balances capturing relevant traces and reducing overhead.- The
spec.selectorsection uses appropriate labels to target specific pods related to theskiperatorapplication and itsskipjobfunctionality, ensuring focused telemetry data collection.This configuration will enhance observability for the specified job while minimizing the impact on other components.
tests/skipjob/telemetry/skipjob-custom-tracing-assert.yaml (1)
1-15: LGTM! The Telemetry resource configuration is well-defined and enhances observability.The introduced YAML configuration file correctly defines a Telemetry resource for Istio, targeting the "minimal-job" managed by the "skiperator" application. The configuration offers the following benefits:
- Integrates tracing capabilities using the "otel-tracing" provider, enabling performance monitoring and debugging.
- Sets a random sampling percentage of 75%, ensuring that a significant portion of traces are captured for analysis.
- Utilizes specific selector labels to precisely target the relevant application components, preventing unintended application of the configuration.
Overall, this configuration enhances the observability of the "minimal-job" and follows best practices for defining Istio Telemetry resources.
tests/skipjob/telemetry/chainsaw-test.yaml (4)
1-2: LGTM!The API version and kind declarations are correct and align with the Chainsaw framework's specifications.
3-4: LGTM!The metadata section is correctly defined, and the name "telemetry" accurately reflects the purpose of the test.
5-8: LGTM!The spec section is correctly structured, and the
skip,concurrent, andskipDeleteflags are appropriately set based on the desired test behavior.
9-19: Verify the contents of the referenced YAML files.The test steps are correctly structured using the try-catch mechanism. The first step appropriately creates a resource and asserts its correctness, while the second step applies a custom tracing configuration and verifies its application.
However, the contents of the referenced YAML files (
skipjob.yaml,skipjob-assert.yaml,skipjob-custom-tracing.yaml,skipjob-custom-tracing-assert.yaml) cannot be verified based on the provided context. Please ensure that these files contain the expected configurations and assertions.tests/application/telemetry/chainsaw-test.yaml (5)
1-2: LGTM!The API version and kind declarations are consistent with the Kyverno policy engine's test configuration format.
3-4: LGTM!The metadata section is correctly defined, and the test name "telemetry" is appropriate for a telemetry application test.
5-8: LGTM!The test specification is correctly defined:
- The test is set to run and not be skipped.
- The test can run concurrently with other tests.
- The created resources will be deleted after the test.
10-15: LGTM!The first test step is correctly defined:
- The step attempts to create a resource from
application.yaml.- The step asserts the correctness of the created resource against
application-assert.yaml.- The
tryblock handles any errors during the step execution.
16-20: LGTM!The second test step is correctly defined:
- The step applies a custom tracing configuration from
application-custom-tracing.yaml.- The step verifies the applied configuration against
application-custom-tracing-assert.yaml.- The
tryblock handles any errors during the step execution.tests/application/telemetry/application-assert.yaml (1)
1-16: LGTM!The Telemetry resource configuration looks good and follows the expected structure for enabling tracing in an Istio-based application using OpenTelemetry.
A few additional insights:
- The random sampling percentage of 10% is a reasonable default value to start with. It can be adjusted based on the observability requirements and the performance impact of tracing.
- The use of label matching in the selector ensures that the configuration is applied only to the intended application. Make sure that the labels used in the selector match the actual labels assigned to the application during deployment.
- The
($namespace)variable in theapplication.skiperator.no/app-namespacelabel should be replaced with the actual namespace value during deployment. Ensure that the deployment process handles this variable substitution correctly.Overall, this configuration enables tracing for the Istio-based application, allowing for better observability and debugging capabilities.
tests/application/telemetry/application-custom-tracing-assert.yaml (1)
1-16: LGTM!The Telemetry resource configuration looks good:
- It uses the correct API version and kind for defining a Telemetry resource.
- The tracing configuration specifies the OpenTelemetry tracing provider with a reasonable random sampling percentage of 75%.
- The selector labels match the intended application managed by "skiperator", ensuring that the telemetry settings are applied only to the desired application instances.
This configuration will enhance observability and performance monitoring for the Istio-based application while aligning with industry standards for distributed tracing.
.github/workflows/test.yml (3)
10-10: Verify if ignoringapi-docs.yamlchanges is intended.Adding
.github/workflows/api-docs.yamlto thepaths-ignorelist for pull requests means the workflow will not run when this file is changed.Please confirm if this is the intended behavior. If the
api-docs.yamlfile impacts the application behavior, ignoring its changes could potentially lead to missing tests.
17-17: Verify if ignoringapi-docs.yamlchanges is intended.Adding
.github/workflows/api-docs.yamlto thepaths-ignorelist for push events means the workflow will not run when this file is changed.Please confirm if this is the intended behavior. If the
api-docs.yamlfile impacts the application behavior, ignoring its changes could potentially lead to missing tests.
29-29: Verify compatibility with Go 1.23.1.The Go version used in the workflow has been updated to 1.23.1.
Please ensure that the codebase and all dependencies are compatible with Go 1.23.1. Incompatibilities could lead to build failures or unexpected behavior.
api/v1alpha1/skipobj_interfaces.go (1)
22-24: LGTM!The addition of the
IstioSettingsfield to theCommonSpecstruct is a well-designed enhancement that enables the management of Istio-specific configurations. The use of a pointer type allows for optional configuration, ensuring backward compatibility and flexibility. The modular design, with theIstioSettingstype imported from theistiotypespackage, promotes code reusability and maintainability.The change aligns with the overall goal of integrating service mesh configurations into the existing resource specifications, as mentioned in the PR objectives.
tests/skipjob/access-policy-job/chainsaw-test.yaml (1)
37-41: LGTM! The added test case improves the test coverage.The new
tryblock withapplyandassertoperations is a valuable addition to the testing framework. It helps validate the system's behavior when a specific status is applied without a job present.By covering this scenario, the test case ensures that the system's readiness state is properly validated under these conditions, thereby enhancing the overall test coverage and robustness of the framework.
tests/application/access-policy/chainsaw-test.yaml (1)
7-7: LGTM!Setting
concurrenttofalseis a valid change for a test configuration. It will make the test steps run sequentially, which can be beneficial for determinism and debugging, at the cost of potentially increased execution time..github/workflows/release-version.yaml (1)
28-28: Approve the Go version update.Updating the Go version to 1.23.1 is a good move to leverage the latest language features, performance optimizations, and bug fixes.
Please ensure that the codebase is compatible with Go 1.23.1 by running tests and validations against this version before merging the changes.
tests/skipjob/access-policy-job/status-ready-no-job-assert.yaml (3)
1-30: LGTM!The
metadataandstatussections are well-defined and align with the PR objective. The resource name is clear, the access policies are ready, and all subresources are synced. The job states and overall summary provide a clear picture of the resource's status.
32-37: Verify the placeholder image name.The
spec.containersection allows outbound access to the external host "data.helsecert.no", which aligns with the PR objective. However, the container image is specified as "image", which may be a placeholder.Please confirm if "image" is indeed a placeholder and if the actual image name will be provided later or varies based on the environment.
38-45: Verify if allowing job concurrency is intended.The
spec.cronsection defines a reasonable schedule to run the job daily at 6 AM. However,allowConcurrencyis set to "Allow", which may not be ideal if the job performs resource-intensive or conflicting operations.Please confirm if allowing concurrent job runs is intended and consider the potential impact of overlapping runs if the job takes longer than 24 hours to complete.
pkg/util/constants.go (1)
14-15: LGTM!The new global variable
IstioTraceProvideris a clear and descriptive addition to the existing set of constants. The comment provides helpful context about its purpose in representing the trace provider configured in the Istiod installation.This addition may facilitate better integration with observability tools and improve the overall tracing capabilities of the system.
.github/workflows/api-docs.yaml (4)
16-19: LGTM!The step is correctly using the
actions/checkoutaction to check out the repository with a custompathparameter to avoid conflicts.
25-30: LGTM!The step is correctly using the
actions/checkoutaction to check out the target repository with custompath,repository, andssh-keyparameters.
32-34: LGTM!The step is correctly using the
cpcommand to copy the generated documentation file to the target repository.
36-43: LGTM!The step is correctly using the
gitcommand to stage, commit, and push the changes to the target repository.tests/skipjob/access-policy-job/skipjob-cron-assert.yaml (1)
27-27: LGTM!The addition of the
accessPolicies: Readyfield in thestatussection enhances the status reporting of the cron job's access policies. This change improves observability and provides a clear indication of the operational readiness of the access policies.pkg/resourcegenerator/istio/telemetry/telemetry.go (1)
15-53: LGTM!The
Generatefunction is well-implemented and follows a clear logic flow. It correctly handles unsupported SKIP object types, generates unique names for the telemetry resources, and processes the telemetry tracing settings to create correspondingTracingobjects. The function also assigns the necessary metadata and specification to the telemetry resource and adds it to the reconciliation context.The changes enhance the telemetry capabilities of the system by allowing the dynamic generation of Istio telemetry resources based on specific application configurations. The function is designed to handle different SKIP object types and ensures that the telemetry settings are applied to the appropriate workloads through the use of a workload selector.
Overall, the implementation is robust and follows best practices. Great job!
api/v1alpha1/istiotypes/istio_settings.go (3)
8-19: LGTM!The
Tracingstruct is well-defined with clear documentation and validation annotations. The use ofinttype forRandomSamplingPercentagefield is a reasonable choice given the constraints with the kubebuilder code generator. The default value and the ability to disable tracing by setting the value to 0 are also well-documented.
24-29: LGTM!The
Telemetrystruct is well-defined with clear documentation and validation annotations. TheTracingfield is appropriately marked as optional and has a sensible default value. The comment about the potential for future extension to configure additional telemetry settings is also helpful.
34-38: LGTM!The
IstioSettingsstruct is well-defined with clear documentation and validation annotations. TheTelemetryfield is appropriately marked as optional and has a sensible default value that matches the default value of theTracingstruct. The comment about the current support for only telemetry configuration is also helpful.tests/skipjob/cron-job-timezone/skipjob-assert.yaml (3)
1-9: LGTM!The ServiceAccount configuration looks good. It is correctly labeled to associate it with the SKIPJob.
11-49: LGTM!The CronJob configuration looks good. It is correctly configured with:
- A schedule to run every minute
- The
Europe/Oslotimezone- A concurrency policy of
Allow- Reasonable job history limits
- A job template specifying the
perl:5.34.0container image
51-64: LGTM!The Pod configuration looks good. It is correctly labeled to associate it with the SKIPJob, and it has an appropriate owner reference to the Job it belongs to.
.goreleaser.yaml (5)
1-1: LGTM!The
versionfield is correctly set to2, indicating that the configuration file is using version 2 of the GoReleaser configuration file format.
26-42: LGTM!The changes in the
archivessection are well-structured and improve the project's distribution:
- Including the
LICENSEfile in the archive is a good practice for open-source projects.- The updated
name_templategenerates archive names that are more compatible with the OS and architecture naming conventions.- Using zip format for Windows archives ensures better compatibility.
45-63: LGTM!The expanded
dockerssection demonstrates a well-structured approach to building multi-platform Docker images:
- Using the
buildxfeature to build images for different architectures (amd64 and arm64) is a good practice to support a wider range of platforms.- Specifying separate image templates for each architecture allows for better control and flexibility in the image builds.
- Using specific build flags and Dockerfiles for each architecture ensures the images are built correctly for the target platform.
64-68: LGTM!The introduction of the
docker_manifestssection is a great addition to simplify the management and distribution of multi-architecture images:
- Creating a manifest for the multi-architecture images allows users to pull the appropriate image for their platform using a single tag.
- Including both arm64 and amd64 images in the manifest ensures compatibility with a wide range of platforms.
96-96: LGTM!The update in the
snapshotsection fromname_templatetoversion_templateis a good change:
- It aligns the snapshot naming convention with the new versioning scheme.
- This change ensures consistency in the naming of snapshot artifacts.
config/rbac/role.yaml (4)
7-23: LGTM!The added permissions for managing
configmaps,pods,pods/ephemeralcontainers,secrets,serviceaccounts, andservicesare appropriate and comprehensive. The allowed verbs provide the necessary control over these resources.
24-30: Verify if the limited permissions for events are intentional.The permissions for the
eventsresource only allowcreateandpatchoperations. This means the role can generate new events and modify existing ones but cannot read, list, update, or delete events.Please confirm if these limited permissions are intentional and sufficient for the role's intended responsibilities. Consider adding
get,list,watch,update, anddeleteverbs if the role requires more comprehensive management of events.
194-205: LGTM!The permissions for managing
telemetriesresources in thetelemetry.istio.ioAPI group are appropriate and comprehensive. The allowed verbs provide full control over these resources, which aligns with the overall changes in this file.
31-38: Read-only permissions for namespaces are typically sufficient.The permissions for the
namespacesresource allowget,list, andwatchoperations, providing read-only access. This is usually adequate for most roles that don't need to manage namespaces directly.To confirm if the role requires namespace management permissions, run the following script:
Verification successful
Confirmed: Read-only permissions for namespaces are correct and sufficient.
After thorough verification, the ClusterRole "skiperator" maintains read-only permissions (get, list, watch) for namespaces, which aligns with the original implementation. No create, update, patch, or delete permissions were found for namespaces in any ClusterRole definition.
The current permissions allow for viewing namespaces without the ability to modify them, which is typically sufficient for most use cases and maintains the principle of least privilege.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Check if the role requires namespace management permissions. # Test: Search for occurrences of the role creating, updating, or deleting namespaces. # Expect: No occurrences found. rg --type yaml $'kind:\\s*ClusterRole\\s*\n\\s*name:\\s*skiperator\\s*\n(.*\n)*?\\s*-\\s*namespaces\\s*\n\\s*verbs:\\s*\n(\\s*-\\s*(create|update|patch|delete)\\s*\n)+'Length of output: 342
Script:
#!/bin/bash # Description: Check if any ClusterRole requires namespace management permissions. # Test: Search for occurrences of ClusterRoles with create, update, patch, or delete permissions on namespaces. # Expect: No occurrences found if read-only permissions are sufficient. rg -U --type yaml 'kind:\s*ClusterRole\s*(\n|.)*?resources:\s*(\n|.)*?-\s*namespaces\s*(\n|.)*?verbs:\s*(\n|.)*?(create|update|patch|delete)'Length of output: 1790
.github/workflows/deploy-sandbox-dispatch.yaml (1)
33-33: LGTM! Verify application compatibility with Go 1.23.1.Updating to a newer version of Go is a good practice to leverage new features, performance improvements, and bug fixes. The change itself looks good.
However, it's important to ensure that the Skiperator application is thoroughly tested and verified to be compatible with Go 1.23.1. Please confirm that the application has been tested with this updated Go version and no issues were found.
pkg/resourceschemas/schemas.go (4)
15-15: LGTM!The import statement for the
telemetryv1package is correct and follows the proper naming convention. The package is used in the subsequent code changes, so it is not an unused import.
36-36: Looks good!The registration of the
telemetryv1API with the provided scheme is implemented correctly. TheAddToSchemefunction is called with the correct argument, and the function call is wrapped withutilruntime.Mustto handle any potential errors during the registration process. This change is consistent with the existing code in theAddSchemasfunction.
66-66: Looks good!The addition of
&telemetryv1.TelemetryList{}to the list of object lists returned by theGetApplicationSchemasfunction is implemented correctly. TheTelemetryListtype is consistent with the other types used in the list, and its inclusion suggests that telemetry resources are considered part of the application schemas.
89-89: Looks good!The addition of
&telemetryv1.TelemetryList{}to the list of object lists returned by theGetJobSchemasfunction is implemented correctly. TheTelemetryListtype is consistent with the other types used in the list, and its inclusion suggests that telemetry resources are also considered part of the job schemas.pkg/resourcegenerator/job/job.go (1)
60-60: LGTM!The addition of the
TimeZonefield to theCronJobSpecstruct is a valuable enhancement. It allows for more precise scheduling of cron jobs based on time zone considerations, improving the flexibility and accuracy of job execution across different geographical contexts.The field is correctly sourced from the
skipJob.Spec.Cron.TimeZoneproperty, ensuring that the specified time zone is properly applied to the cron job specification.This change reflects a positive improvement in the handling of scheduling configurations for cron jobs within the Skiperator framework.
.github/workflows/build-and-deploy.yaml (1)
104-104: LGTM!Updating the Go version to
1.23.1is a good practice to ensure access to the latest features, performance improvements, and bug fixes. The minor version update is unlikely to introduce any breaking changes or compatibility issues.README.md (3)
166-171: LGTM!The introduction of the
podSettingsfield in theApplicationresource is a valuable addition. It provides more control over pod-specific configurations, such as annotations, termination grace period, and pod spread topology constraints. These settings enhance the flexibility and customization options for deploying applications.
172-177: Ensure the sampling percentage is set appropriately.The introduction of the
istioSettingsfield in theApplicationresource is a useful addition for configuring Istio-specific settings. Thetelemetry.tracing.randomSamplingPercentagefield allows adjusting the sampling percentage for tracing, which can be helpful for controlling the amount of tracing data collected for the application.Please ensure that the specified sampling percentage is within the valid range and aligns with the tracing requirements of your application.
18-18: Verify the new API documentation link.Please ensure that the updated link
https://skip.kartverket.no/docs/skiperatoris accessible and contains the expected API documentation.Run the following script to verify the link:
Verification successful
New API documentation link is accessible
The updated link
https://skip.kartverket.no/docs/skiperatoris accessible and returns a successful HTTP status code (200). This indicates that the link is valid and likely contains the expected API documentation.However, to ensure the content is correct:
- Please manually verify that the link leads to the intended API documentation for Skiperator.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the accessibility of the new API documentation link. # Test: Check if the link is accessible. Expect: Status code 200. curl -I -s -o /dev/null -w "%{http_code}" https://skip.kartverket.no/docs/skiperatorLength of output: 90
pkg/resourcegenerator/networkpolicy/dynamic/common.go (4)
11-12: LGTM!The new imports
slicesandstringsare valid additions, likely used in the newsortNetPolPortsfunction.
53-53: LGTM!The updated
getIngressRulesfunction call correctly passes the newHostCollectiontype.
106-106: LGTM!Sorting the ports using the
sortNetPolPortsfunction is a good addition for maintaining consistency in the egress rules.
237-237: Consider centralizing label definitions.The function
getIngressGatewayLabeldetermines labels based on whether the ingress is internal or external. This is a critical piece of logic that could benefit from being placed in a centralized configuration or constants file, as suggested by the existing TODO comment.- // TODO Should be in constants or something + // Moved to constants for better maintainabilityMoving these label definitions to a constants file not only cleans up the code but also makes it easier to manage changes to these labels in the future.
Likely invalid or redundant comment.
api/v1alpha1/skipjob_types.go (4)
6-6: LGTM!The import statement for the
istiotypespackage is correctly added.
85-91: LGTM!The
IstioSettingsfield is correctly added to theSKIPJobSpecstruct with appropriate annotations and default value.
187-193: LGTM!The
TimeZonefield is correctly added to theCronSettingsstruct with appropriate annotations and comment.
299-301: LGTM!The
GetCommonSpecmethod is correctly updated to include theIstioSettingsfield.go.mod (5)
3-3: LGTM!Updating the Go version to 1.23.1 ensures compatibility with the latest language features and improvements. The minor version bump should maintain backward compatibility.
10-12: LGTM!Updating the dependencies to newer versions can provide bug fixes, performance improvements, and new features. The minor version bumps should maintain backward compatibility.
20-21: LGTM!Updating the dependencies to newer versions can provide bug fixes, performance improvements, and new features. The minor version bumps for
google.golang.org/protobufandsigs.k8s.io/controller-toolsshould maintain backward compatibility. The more significant version bump forgolang.org/x/expis expected, as it's an experimental package.Also applies to: 29-29
34-38: LGTM!Updating the Google Cloud and AWS SDK dependencies to newer versions can provide bug fixes, performance improvements, and new features. The minor version bumps should maintain backward compatibility.
Also applies to: 57-57
118-118: LGTM!Updating the various dependencies to newer versions can provide bug fixes, performance improvements, and new features. The version bumps are mostly minor or patch releases, which should maintain backward compatibility.
Also applies to: 122-122, 124-124, 137-138, 160-160, 162-162, 190-197, 211-214, 225-226, 230-230
internal/controllers/skipjob.go (6)
12-12: LGTM!The import for the telemetry package is added correctly.
19-19: LGTM!The import for the telemetry v1 package is added correctly.
42-42: LGTM!The RBAC permission to manage telemetry resources is added correctly.
80-80: LGTM!The ownership of telemetry v1 resources is set correctly.
153-153: LGTM!The telemetry.Generate function is added correctly to the resource generation logic.
307-314: LGTM!The modification to set explicit conditions when no jobs are found is implemented correctly. This change enhances the clarity of the job's status in the absence of jobs.
internal/controllers/application.go (4)
20-20: LGTM!The import statement for the
telemetrypackage is correctly added, enabling the application to utilize telemetry-related functionalities.
35-35: LGTM!The import statement for the
telemetryv1package is correctly added, enabling the application to utilize thetelemetryv1package.
62-62: LGTM!The RBAC annotation is correctly added to grant permissions for managing
telemetriesresources, allowing the necessary operations on these resources.
90-90: LGTM!The changes to include ownership of
Telemetryresources in theSetupWithManagerfunction and the addition oftelemetry.Generatein theReconcilefunction are correctly implemented. These modifications ensure proper management and generation of telemetry resources as part of the application's lifecycle.Also applies to: 202-202
api/v1alpha1/application_types.go (2)
339-342: Review the newIngressesstruct.The new
Ingressesstruct has been introduced to represent ingress data with additional metadata. It contains the following fields:
Hostname: Represents the ingress hostname.Internal: A pointer to a boolean indicating whether the ingress is internal or not.This struct aligns with the goal of providing a more structured representation of ingress data, allowing for the inclusion of relevant metadata. The addition of this struct is a positive change that supports the PR's objectives.
445-448: Review the inclusion of additional fields in theCommonSpecstruct.The
GetCommonSpecmethod has been updated to include the following additional fields:
GCPAccessPolicyIstioSettingsThese fields are assigned from the corresponding fields in the
ApplicationSpec. Including them in theCommonSpecstruct suggests that they are now considered part of the common specification for an application.The changes align with the overall goal of enhancing the application specification and configuration. Populating these fields in the
GetCommonSpecmethod ensures that they are properly included when retrieving the common specification.api/v1alpha1/zz_generated.deepcopy.go (4)
81-82: LGTM!The changes to handle the
Ingressesfield as a pointer tov1.JSONtype and the addition of theIstioSettingsfield are implemented correctly.Also applies to: 207-211
329-333: LGTM!The addition of the
TimeZonefield and its deep copy logic are implemented correctly.
509-513: LGTM!The addition of the
Internalfield and its deep copy logic are implemented correctly.
621-625: LGTM!The addition of the
IstioSettingsfield and its deep copy logic are implemented correctly.config/crd/skiperator.kartverket.no_skipjobs.yaml (3)
6-6: LGTM!The version bump for the
controller-genannotation looks good. This change alone does not introduce any functional changes to the CRD.
783-789: Approve the addition of thetimeZonefield.The new
timeZonefield in thespec.job.cronobject is a valuable addition. It allows users to specify the time zone for the job schedule, defaulting to the cluster's time zone if not provided. This enhances the flexibility of scheduling jobs according to local time requirements.The field description and example provide clear guidance on usage.
793-832: Approve the addition of theistioSettingsobject and its tracing configuration.The new
istioSettingsobject in thespec.jobobject is a valuable addition. It provides configuration options for Istio-specific resources, particularly focusing on telemetry settings.Within the
istioSettingsobject, thetracingconfiguration allows users to control the sampling rate for tracing requests, with a default value of 10%. This enables flexibility in managing the tracing overhead while providing a reasonable starting point.The detailed structure of the
istioSettingsobject, including properties for telemetry and tracing, is well-defined and enhances the observability and monitoring capabilities of the jobs.
There was a problem hiding this comment.
Actionable comments posted: 2
Outside diff range and nitpick comments (2)
api/v1alpha1/application_types.go (2)
451-460: Consider improving error handling and type safety.The
MarshalledIngressesfunction could be improved in a couple of ways:
Return the error along with the
nilresult when marshaling fails. This will help with debugging and prevent silent failures.Consider using a more specific type for the
ingressesparameter instead ofinterface{}. This will improve type safety and catch potential issues at compile time.
463-491: LGTM with a minor suggestion!The changes to the
Hostsmethod look good overall. The dual unmarshaling approach provides backward compatibility, and the error handling has been improved.One suggestion: Consider accumulating all errors encountered during processing of the object format before returning, similar to how it's done for the string format. This will provide a complete view of all issues.
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (6)
- api/v1alpha1/application_types.go (5 hunks)
- config/crd/skiperator.kartverket.no_applications.yaml (2 hunks)
- tests/routing/internal-flag/application.yaml (1 hunks)
- tests/routing/internal-flag/chainsaw-test.yaml (1 hunks)
- tests/routing/internal-flag/routing-internal-flag-assert.yaml (1 hunks)
- tests/routing/internal-flag/routing-internal-flag.yaml (1 hunks)
Files skipped from review as they are similar to previous changes (3)
- config/crd/skiperator.kartverket.no_applications.yaml
- tests/routing/internal-flag/routing-internal-flag-assert.yaml
- tests/routing/internal-flag/routing-internal-flag.yaml
Additional context used
yamllint
tests/routing/internal-flag/chainsaw-test.yaml
[error] 17-17: no new line character at the end of file
(new-line-at-end-of-file)
Additional comments not posted (4)
tests/routing/internal-flag/application.yaml (1)
1-15: LGTM!The YAML file correctly defines two Application resources for testing purposes. The use of the same generic
imagewith differentportconfigurations is a valid approach for testing multiple instances of an application.The file structure follows the standard Kubernetes resource definition format, and all the necessary fields are properly specified.
tests/routing/internal-flag/chainsaw-test.yaml (1)
1-17: The test configuration looks good and follows the Chainsaw framework's conventions.The test is well-structured and clearly defines the steps to validate the functionality of the new internal flag for routing configurations. It applies the necessary YAML files and includes an assertion step to verify the expected outcomes.
The test aligns with the PR objectives of introducing a new flag to streamline the process of toggling between internal and external ingress configurations.
Tools
yamllint
[error] 17-17: no new line character at the end of file
(new-line-at-end-of-file)
api/v1alpha1/application_types.go (2)
247-254: LGTM!The new
IstioSettingsfield with a default value that enables tracing with a 10% random sampling rate is a good addition. It provides flexibility to configure Istio-specific settings directly within theApplicationresource while keeping the default behavior sensible.
339-342: LGTM!The new
Ingressesstruct provides a clean and structured way to represent ingress data, aligning with the change to theIngressesfield inApplicationSpec. TheInternalfield being a*boolallows for flexibility in specifying the internal/external state of an ingress.
Co-authored-by: Martin Haram Nygård <[email protected]>
There was a problem hiding this comment.
Actionable comments posted: 1
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- api/v1alpha1/hosts.go (5 hunks)
Additional context used
GitHub Check: Build and run tests
api/v1alpha1/hosts.go
[failure] 57-57:
undefined: IsInternal
Additional comments not posted (5)
api/v1alpha1/hosts.go (5)
6-6: LGTM!The import statement for the "regexp" package is valid and necessary for using regular expressions later in the code.
19-19: LGTM!Adding the "Internal" field to the "Host" struct is a valid change. It allows the system to track whether a host is internal or external.
71-71: LGTM!Modifying the "Add" method of the "HostCollection" struct to accept an additional "internal" parameter and using it to set the "Internal" field of the "Host" struct is a valid change. It allows the "HostCollection" to manage the internal status of hosts more explicitly.
The past review comment suggesting to modify the method signature is not applicable anymore as the method signature has already been modified as suggested.
Also applies to: 77-77
114-116: LGTM!The "isInternal" function is a valid addition to the code. It encapsulates the logic to determine if a hostname is internal or not.
The past review comment suggesting to modify the function signature is not applicable anymore as the function signature is already defined as suggested.
12-13: Anchor the regular expression for internal hostnames.The regular expression used to determine internal hostnames is missing anchors to ensure that the pattern matches the entire hostname rather than any part of it. This might lead to unintended matches if the pattern appears anywhere within a larger string.
Modify the regular expression to ensure it matches the entire hostname:
-var internalPattern = regexp.MustCompile(`[^.]\.skip\.statkart\.no|[^.]\.kartverket-intern.cloud`) +var internalPattern = regexp.MustCompile(`^(?:[^.]+\.skip\.statkart\.no|[^.]+\.kartverket-intern.cloud)$`)
There was a problem hiding this comment.
Actionable comments posted: 4
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (2)
- api/v1alpha1/application_types.go (4 hunks)
- api/v1alpha1/hosts.go (5 hunks)
Files skipped from review as they are similar to previous changes (1)
- api/v1alpha1/hosts.go
Additional comments not posted (1)
api/v1alpha1/application_types.go (1)
72-72: Breaking Change toIngressesFieldChanging the
Ingressesfield from[]stringto*apiextensionsv1.JSONintroduces a significant change that may affect backward compatibility. Ensure that existing deployments and configurations that rely on the old[]stringformat are properly handled or migrated to prevent runtime issues.To verify if the old
Ingressesformat is used elsewhere in the codebase, run the following script:
api/v1alpha1/application_types.go
Outdated
| type Ingresses struct { | ||
| Hostname string | ||
| Internal *bool | ||
| } |
There was a problem hiding this comment.
Missing JSON Tags in Ingresses Struct
The fields in the Ingresses struct lack JSON tags, which may lead to issues during JSON marshaling and unmarshaling. To ensure proper serialization, add JSON tags to the struct fields.
Apply the following diff to add the necessary JSON tags:
type Ingresses struct {
- Hostname string
- Internal *bool
+ Hostname string `json:"hostname"`
+ Internal *bool `json:"internal,omitempty"`
}Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| type Ingresses struct { | |
| Hostname string | |
| Internal *bool | |
| } | |
| type Ingresses struct { | |
| Hostname string `json:"hostname"` | |
| Internal *bool `json:"internal,omitempty"` | |
| } |
api/v1alpha1/application_types.go
Outdated
| func (s *ApplicationSpec) Hosts() (HostCollection, error) { | ||
| var ingressesAsString []string | ||
| var ingressesAsObject []Ingresses | ||
| var errorsFound []error | ||
| hosts := NewCollection() | ||
|
|
||
| var errorsFound []error | ||
| for _, ingress := range s.Ingresses { | ||
| err := hosts.Add(ingress) | ||
| ingresses := MarshalledIngresses(s.Ingresses) | ||
| err := json.Unmarshal(ingresses.Raw, &ingressesAsString) | ||
|
|
||
| if err != nil { | ||
| err := json.Unmarshal(ingresses.Raw, &ingressesAsObject) | ||
| if err != nil { | ||
| errorsFound = append(errorsFound, err) | ||
| return NewCollection(), errors.Join(errorsFound...) | ||
| } | ||
|
|
||
| for _, ingress := range ingressesAsObject { | ||
| if ingress.Internal == nil { | ||
| ingress.Internal = util.PointTo(IsInternal(ingress.Hostname)) | ||
| } | ||
|
|
||
| err := hosts.Add(ingress.Hostname, *ingress.Internal) | ||
| if err != nil { | ||
| errorsFound = append(errorsFound, err) | ||
| return NewCollection(), errors.Join(errorsFound...) | ||
| } | ||
| } | ||
| return hosts, nil | ||
| } | ||
|
|
||
| for _, ingress := range ingressesAsString { | ||
| err := hosts.Add(ingress, IsInternal(ingress)) | ||
| if err != nil { | ||
| errorsFound = append(errorsFound, err) | ||
| continue | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
| func (s *ApplicationSpec) Hosts() (HostCollection, error) { | |
| var ingressesAsString []string | |
| var ingressesAsObject []Ingresses | |
| var errorsFound []error | |
| hosts := NewCollection() | |
| var errorsFound []error | |
| for _, ingress := range s.Ingresses { | |
| err := hosts.Add(ingress) | |
| ingresses := MarshalledIngresses(s.Ingresses) | |
| err := json.Unmarshal(ingresses.Raw, &ingressesAsString) | |
| if err != nil { | |
| err := json.Unmarshal(ingresses.Raw, &ingressesAsObject) | |
| if err != nil { | |
| errorsFound = append(errorsFound, err) | |
| return NewCollection(), errors.Join(errorsFound...) | |
| } | |
| for _, ingress := range ingressesAsObject { | |
| if ingress.Internal == nil { | |
| ingress.Internal = util.PointTo(IsInternal(ingress.Hostname)) | |
| } | |
| err := hosts.Add(ingress.Hostname, *ingress.Internal) | |
| if err != nil { | |
| errorsFound = append(errorsFound, err) | |
| return NewCollection(), errors.Join(errorsFound...) | |
| } | |
| } | |
| return hosts, nil | |
| } | |
| for _, ingress := range ingressesAsString { | |
| err := hosts.Add(ingress, IsInternal(ingress)) | |
| if err != nil { | |
| errorsFound = append(errorsFound, err) | |
| continue | |
| } | |
| } | |
| func (s *ApplicationSpec) Hosts() (HostCollection, error) { | |
| var legacyIngresses []string | |
| var flexibleIngresses []Ingresses | |
| var errorsFound []error | |
| hosts := NewCollection() | |
| jsonIngresses := MarshalledIngresses(s.Ingresses) | |
| err := json.Unmarshal(jsonIngresses.Raw, &legacyIngresses) | |
| // If the ingresses supplied is not a list of hostnames (legacy), i.e. the modern approach with objects | |
| if err != nil { | |
| if mErr := json.Unmarshal(jsonIngresses.Raw, &flexibleIngresses); mErr != nil { | |
| errorsFound = append(errorsFound, mErr) | |
| return hosts, errors.Join(errorsFound...) | |
| } | |
| for _, ingress := range flexibleIngresses { | |
| if ingress.Internal == nil { | |
| ingress.Internal = util.PointTo(IsInternal(ingress.Hostname)) | |
| } | |
| if aErr := hosts.Add(ingress.Hostname, *ingress.Internal); aErr != nil { | |
| errorsFound = append(errorsFound, aErr) | |
| } | |
| } | |
| return hosts, errors.Join(errorsFound...) | |
| } | |
| // Handle the legacy format | |
| for _, ingress := range legacyIngresses { | |
| err := hosts.Add(ingress, IsInternal(ingress)) | |
| if err != nil { | |
| errorsFound = append(errorsFound, err) | |
| } | |
| } |
tests/application/internal-flag/application-internal-missing-internal-flag-ext.yaml
Outdated
Show resolved
Hide resolved
tests/application/internal-flag/application-internal-missing-internal-flag-ext-assert.yaml
Outdated
Show resolved
Hide resolved
This reverts commit 12eb2a8.
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
📒 Files selected for processing (1)
- api/v1alpha1/application_types.go (4 hunks)
🔇 Additional comments (6)
api/v1alpha1/application_types.go (6)
9-9: Import statement is necessaryThe import
"github.com/kartverket/skiperator/pkg/util"is required for utility functions used within the code, such asutil.PointTo.
72-72: Enhanced flexibility with updatedIngressesfieldChanging the
Ingressesfield to*apiextensionsv1.JSONallows for more flexible and complex ingress configurations, improving the application's extensibility.
493-493: Correct function name fromisInternaltoIsInternalSimilarly, update the function call to use the correct function name.
Apply this diff:
- err := hosts.Add(ingress, isInternal(ingress)) + err := hosts.Add(ingress, IsInternal(ingress))
481-481:⚠️ Potential issueCorrect function name from
isInternaltoIsInternalThe function
isInternalis undefined. It should beIsInternalwith an uppercase 'I' to match the existing function.Apply this diff to fix the function call:
- ingress.Internal = util.PointTo(isInternal(ingress.Hostname)) + ingress.Internal = util.PointTo(IsInternal(ingress.Hostname))Likely invalid or redundant comment.
339-342: 🛠️ Refactor suggestionConsider adding JSON tags to
Ingressesstruct fieldsTo ensure proper JSON serialization and deserialization, it's recommended to add JSON tags to the
Ingressesstruct fields.Apply the following diff to include JSON tags:
type Ingresses struct { - Hostname string - Internal *bool + Hostname string `json:"hostname"` + Internal *bool `json:"internal,omitempty"` }Likely invalid or redundant comment.
451-461:⚠️ Potential issueEnhance error handling in
MarshalledIngressesfunctionCurrently,
MarshalledIngressesreturnsnilwhen marshaling fails without providing error details. Modifying the function to return an error alongside the JSON object will improve error transparency and handling.Consider updating the function signature and implementation:
-func MarshalledIngresses(ingresses interface{}) *apiextensionsv1.JSON { +func MarshalledIngresses(ingresses interface{}) (*apiextensionsv1.JSON, error) {And modify the return statement:
IngressesJSON.Raw, err = json.Marshal(ingresses) if err == nil { return IngressesJSON } - return nil + return nil, errEnsure that callers of
MarshalledIngressesare updated to handle the error appropriately.Likely invalid or redundant comment.
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Outside diff range and nitpick comments (2)
api/v1alpha1/application_types.go (2)
464-492: Consider adding unit tests for new ingress handling logicThe introduction of new logic for handling both legacy and new ingress formats in the
Hostsmethod is significant. Adding unit tests will ensure that both formats are handled correctly and will help prevent regressions in the future.Would you like assistance in creating unit tests for this functionality?
340-343: Provide documentation comments for theIngressstructAdding GoDoc comments to the
Ingressstruct will improve code readability and maintainability by clearly describing the purpose and usage of the struct.Example:
+// Ingress represents the configuration for a single ingress host, including whether it's internal. type Ingress struct {
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
📒 Files selected for processing (1)
- api/v1alpha1/application_types.go (4 hunks)
🧰 Additional context used
🔇 Additional comments (3)
api/v1alpha1/application_types.go (3)
73-73: Change toIngressesfield enhances flexibilityThe update of the
Ingressesfield from[]stringto*apiextensionsv1.JSONallows for more complex ingress configurations while maintaining backward compatibility through the parsing logic in theHostsmethod.
452-461: Improved error handling inMarshalledIngressesfunctionGreat job updating the
MarshalledIngressesfunction to return an error alongside the JSON object. This enhancement improves transparency and allows callers to handle errors more effectively.
464-492:⚠️ Potential issueConsistent use of
IsInternalfunctionThe function
isInternalis used in theHostsmethod, but it appears to be undefined. The correct function, based on the context and naming conventions, might beIsInternal.Apply this diff to correct the function calls:
if ingress.Internal == nil { - ingress.Internal = util.PointTo(isInternal(ingress.Hostname)) + ingress.Internal = util.PointTo(IsInternal(ingress.Hostname)) } ... - err := hosts.Add(ingress, isInternal(ingress)) + err := hosts.Add(ingress, IsInternal(ingress))
| type Ingress struct { | ||
| Hostname string | ||
| Internal *bool | ||
| } |
There was a problem hiding this comment.
Add JSON tags to the Ingress struct fields
To ensure proper JSON marshaling and unmarshaling, add JSON struct tags to the Hostname and Internal fields. This facilitates accurate serialization and deserialization when handling ingress data.
Apply the following diff to include the JSON tags:
type Ingress struct {
- Hostname string
- Internal *bool
+ Hostname string `json:"hostname"`
+ Internal *bool `json:"internal,omitempty"`
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| type Ingress struct { | |
| Hostname string | |
| Internal *bool | |
| } | |
| type Ingress struct { | |
| Hostname string `json:"hostname"` | |
| Internal *bool `json:"internal,omitempty"` | |
| } |
Added flag to enable teams to switch between internal and external ingress without matching the regex that handled this earlier.
Summary by CodeRabbit
Summary by CodeRabbit
New Features
Bug Fixes
Tests