MLE-20917: Port changes from master to develop #330
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MLE-17900/Update code blocks and fix some syntax (cherry picked from commit 674801d)
Release 2.0.0 with README update
Sync change from develop to release branch
* update the Chart version to 2.0.1 and MarkLogic Version to 11.3.1 * update Notice and README for Helm 2.0.1 Release * update in Notice File * update latest Notice file * update go version to 1.23.6 for security vulverabilities * update version for vulerabilities --------- Co-authored-by: Peng Zhou <[email protected]>
…-version MLE-20917 update docker package version for security vulnerabilites
Co-authored-by: Peng Zhou <[email protected]>
Co-authored-by: Peng Zhou <[email protected]>
Co-authored-by: Peng Zhou <[email protected]>
…om-cookie MLE-21334/remove Security attribute from cookie
MLE-21473 Add missing namespace to configmap and service account
Mle 21676/HAProxy image can only be define in the subchart values.yaml file
…nt-images MLE-20181 scan all dependent images
* MLE-21148: Add retry for group config * add comment to retry functions * fix the bug for retry --------- Co-authored-by: Peng Zhou <[email protected]>
* MLE-22607: update haproxy version to 3.2.1 * update README --------- Co-authored-by: Peng Zhou <[email protected]>
Co-authored-by: Peng Zhou <[email protected]>
Release Helm 2.1.0
pengzhouml
requested review from
barkhachoithani,
Copilot,
rwinieski,
sumanthravipati and
vitalykorolev
and removed request for
barkhachoithani,
Copilot and
vitalykorolev
There was a problem hiding this comment.
Pull Request Overview
This PR ports changes from the master branch into the develop branch and updates dependency versions, image tags, and certain configuration details. Key changes include modifications to the image scan logic in the makefile, updates to dependency versions in go.mod, changes in the liveness probe setup in the statefulset template, and adjustments to HAProxy cookie configuration.
Reviewed Changes
Copilot reviewed 16 out of 17 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| makefile | Improved image scan logic and refactored output redirection |
| go.mod | Upgraded dependency versions |
| charts/values.yaml | Updated image tag and repository details |
| charts/templates/statefulset.yaml | Modified liveness probe from exec command to a tcpSocket probe |
| charts/templates/serviceaccount.yaml | Added explicit namespace configuration |
| charts/templates/configmap-scripts.yaml | Updated logging behavior and introduced a retry function |
| charts/templates/configmap-haproxy.yaml | Removed the secure flag from cookie configuration for HAProxy |
| charts/charts/haproxy/* | Copyright updates reflecting the change in ownership |
| charts/Chart.yaml | Bumped the chart version to 2.1.0 |
| README.md | Updated documentation to reflect new image tags and descriptions |
| NOTICE.txt, LICENSE.txt | Updated copyright information |
| Jenkinsfile | Adjusted image list retrieval logic |
Comments suppressed due to low confidence (2)
charts/templates/configmap-haproxy.yaml:115
- The removal of the 'secure' flag in the cookie configuration may reduce transport security; ensure that HTTPS is not required or document the rationale for this change.
cookie haproxy insert indirect httponly nocache maxidle 30m maxlife 4h
charts/templates/statefulset.yaml:203
- Switching the liveness probe from an exec command to a tcpSocket probe on port 8001 changes the health check behavior; verify that this approach meets the application's readiness requirements.
tcpSocket:
| | `haproxy.enabled` | Parameter to enable the HAProxy Load Balancer for MarkLogic Server | `false` | | ||
| | `haproxy.image.repository` | Repository for HAProxy image | `haproxytech/haproxy-alpine` | | ||
| | `haproxy.image.tag` | Tag for HAProxy image | `3.2.1` | | ||
| | `haproxy.image.pullPolicy` | Haproxy iamge Pull Policy | `IfNotPresent` | |
There was a problem hiding this comment.
Typo in the description for 'haproxy.image.pullPolicy': 'iamge' should be corrected to 'image'.
Suggested change
| | `haproxy.image.pullPolicy` | Haproxy iamge Pull Policy | `IfNotPresent` | | |
| | `haproxy.image.pullPolicy` | Haproxy image Pull Policy | `IfNotPresent` | |
Comment on lines
233
to
+236
| .PHONY: image-scan | ||
| image-scan: | ||
|
|
||
| @rm -f helm_image.list dep-image-scan.txt | ||
| @$(if $(saveOutput), > dep-image-scan.txt) |
There was a problem hiding this comment.
[nitpick] The inline conditional redirection may be unclear; consider adding a comment or refactoring the logic for improved readability.
pengzhouml
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.