Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

[TT-8822] Improve hash comparision in Reconciliation #625

Merged
merged 16 commits into from
May 19, 2023
Merged

[TT-8822] Improve hash comparision in Reconciliation #625

merged 16 commits into from
May 19, 2023

Conversation

buraksekili
Copy link
Collaborator

@buraksekili buraksekili commented May 15, 2023 •
edited
Loading

Description

This PR improves the current hash comparison used to determine whether to send PUT requests or not, in order to update a resource.

It adds 2 status fields to ApiDefinition and SecurityPolicy CRDs

  • latestTykSpecHash which stores the hash of lastly fetched resource from Tyk
  • latestCRDSpecHash which stores the hash of lastly reconciled CR.

Related Issue

Motivation and Context

Test Coverage For This Change

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • Make sure you are requesting to pull a topic/feature/bugfix branch (right side). If PRing from your fork, don't come from your master!
  • Make sure you are making a pull request against our master branch (left side). Also, it would be best if you started your change off our latest master.
  • Make sure you are updating CHANGELOG.md based on your changes.
  • My change requires a change to the documentation.
    • If you've changed APIs, describe what needs to be updated in the documentation.
  • I have updated the documentation accordingly.
  • If you've changed API models, please update CRDs.
    • make manifests
    • make helm
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • Check your code additions will not fail linting checks:
    • gofmt -s -w .
    • go vet ./...
    • golangci-lint run

@buraksekili
Improve hash comparision in Policy Controller
5b1d2dd 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Add retry for policy controller
e6ddb71 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Wrap error prone functions with wait.For() to retrigger execution in …
eaaaa67 
…case of errors

Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Improve hasher of ApiDefinition Controller
32280ac 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Add wait.For to tests
5158168 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
remove retry functions after creating a tyk resource
3cca3d7 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
remove old tests
848ebce 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili buraksekili changed the title Improve hash comparision in Reconciliation [TT-8822] Improve hash comparision in Reconciliation May 15, 2023
@buraksekili buraksekili marked this pull request as ready for review May 15, 2023 12:45
@buraksekili buraksekili requested a review from a team as a code owner May 15, 2023 12:45
@buraksekili buraksekili requested review from andrei-tyk and removed request for a team May 15, 2023 12:45
@buraksekili buraksekili mentioned this pull request May 15, 2023
Closed
18 tasks
andrei-tyk
andrei-tyk reviewed May 17, 2023
View reviewed changes
controllers/common.go Outdated Show resolved Hide resolved
@buraksekili
Update calculateHash() function according to feedback - so, it only t…
0365448 
…akes one argument

Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Remove extra print statements
7799dba 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
move errors to constats
cb14d3b 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
buraksekili and others added 6 commits May 18, 2023 23:40
@buraksekili
Merge branch 'master' into fix/TT-8822/reconciliation
1da4b21
@buraksekili
Resolve linter issues
81293ee 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Move cuddled statemtn
863f332 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Resolve conflicts
d273453 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@buraksekili
Remove duplicated assignment
a2ab469 
Signed-off-by: Burak Sekili <buraksekili@gmail.com>
@singhpr
Merge branch 'master' into fix/TT-8822/reconciliation
08b82dd
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

2.2% 2.2% Coverage
12.3% 12.3% Duplication

@singhpr singhpr merged commit 910af9b into master May 19, 2023
@singhpr singhpr deleted the fix/TT-8822/reconciliation branch May 19, 2023 06:35
buger pushed a commit that referenced this pull request May 22, 2024
@buraksekili @singhpr
[TT-8822] Improve hash comparision in Reconciliation (#625)
eb874d3 
* Improve hash comparision in Policy Controller

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Add retry for policy controller

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Wrap error prone functions with wait.For() to retrigger execution in case of errors

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Improve hasher of ApiDefinition Controller

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Add wait.For to tests

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* remove retry functions after creating a tyk resource

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* remove old tests

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Update calculateHash() function according to feedback - so, it only takes one argument

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Remove extra print statements

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* move errors to constats

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Resolve linter issues

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Move cuddled statemtn

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Resolve conflicts

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

* Remove duplicated assignment

Signed-off-by: Burak Sekili <buraksekili@gmail.com>

---------

Signed-off-by: Burak Sekili <buraksekili@gmail.com>
Co-authored-by: Pranshu <104971506+singhpr@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@andrei-tyk andrei-tyk andrei-tyk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@buraksekili @andrei-tyk @singhpr