MLE-23621: Merge master back to develop after 1.1 release #114
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
…caled down to 0 replicas (#104) * MLE-24840: fix bug when scale node to 0 failed * fix context issue --------- Co-authored-by: Peng Zhou <peng.zhou@progress.com>
* Add publishing step and enable scheduled builds * move blackduck scan after publishing * Ensure we run container scan when we publish, otherwise just the source --------- Co-authored-by: Vitaly Korolev <vitaly.korolev@marklogic.com>
* MLE-24871: upgrade go version and dependency version for security fix * add change for docker file * update the VERSION to 1.1.0 * MLE-24842: Fix security Vulnerability issue with The Kubernetes container requests the NET_RAW capability * MLE-24842: Fix security issue with The Kubernetes container is allowed to run as the root user * Fix linting issue * Fix test issue * Change the Kubernetes Version to 1.31.13 * change the Kubernetes version to 1.31.13 * change env_Kubernetes Version * add MINIKUBE_HOME to Jenkins Environment * Update the notice file based on go.mod --------- Co-authored-by: Peng Zhou <peng.zhou@progress.com>
#107) * added new Copyright line in the files * Update api/v1/common_types.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update internal/controller/marklogicgroup_controller.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update pkg/k8sutil/haProxy.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * added Copyright message to test data files --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
removed duplicate import of "reflect" package causing test failure.
Co-authored-by: Peng Zhou <peng.zhou@progress.com>
* MLE-24871: update default MarkLogic Image version to 12 * update defualt image for minimal-production.yaml --------- Co-authored-by: Peng Zhou <peng.zhou@progress.com>
* MLE-25053: update the readme for Operator 1.1 * update fluent-bit to latest 4.1.1 * update sample config files * fix error in kustomization file * update readme for known issue regarding fluent-bit * remove unneeded files * update the docker-build script * update the fluent-bit version to 4.1.1 * add back hugespages2Mi: "24Gi" --------- Co-authored-by: Peng Zhou <peng.zhou@progress.com>
* MLE-25068: Support extra config for fluent-bit * MLE-25068: Support Extra Configuration for Log Collection * Fix handling indentation for log collection * MLE-25101: Fix AdditionalVolumeMount does not mount to Fluent-bit Correctly --------- Co-authored-by: Peng Zhou <peng.zhou@progress.com>
MLE-24161: Releasing MarkLogic Kubernetes Operator 1.1.0
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR merges master back to develop after the 1.1 release, incorporating copyright updates, dependency upgrades, and various bug fixes and improvements made in the 1.1 release.
Key changes:
- Updated copyright headers across all files to Progress Software Corporation
- Upgraded Go version to 1.24.9 and Kubernetes dependencies to v0.34.1
- Updated default MarkLogic and Fluent Bit image versions
- Bug fixes in statefulset reconciliation, service account handling, and FluentBit configuration
Reviewed Changes
Copilot reviewed 97 out of 103 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| go.mod | Updated Go version and all Kubernetes/controller dependencies to latest versions |
| pkg/k8sutil/statefulset.go | Fixed statefulset reconciliation logic and context usage |
| pkg/k8sutil/serviceaccount.go | Added owner reference and early return handling |
| pkg/k8sutil/configmap.go | Refactored FluentBit YAML configuration generation with new normalization function |
| config/samples/*.yaml | Updated default image versions and FluentBit configuration format |
| Makefile | Updated version to 1.1.0 and build configurations |
| All source files | Added Progress Software Corporation copyright headers |
Comments suppressed due to low confidence (1)
pkg/k8sutil/statefulset.go:1
- [nitpick] Unnecessary change: the original fmt.Sprintf was removed, but the string is static with no format parameters. While this is correct, it's a stylistic change rather than a functional improvement. Consider whether this change adds value to the merge.
// Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+437
to
+438
| _, _ = hash.Write([]byte(k)) | ||
| _, _ = hash.Write([]byte(data[k])) |
There was a problem hiding this comment.
[nitpick] Explicitly ignoring hash.Write errors with blank identifiers is acceptable since hash.Write from crypto/sha256 never returns errors, but the original code was cleaner. Consider whether this change is necessary for the merge.
Suggested change
| _, _ = hash.Write([]byte(k)) | |
| _, _ = hash.Write([]byte(data[k])) | |
| hash.Write([]byte(k)) | |
| hash.Write([]byte(data[k])) |
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.