Skip to content

MLE-26255: Merge Master back to develop #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pengzhouml merged 5 commits into from
Feb 9, 2026
Merged

MLE-26255: Merge Master back to develop #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39b4430
updated copyright end year for required files
barkhachoithani Jan 9, 2026
cdcddd2
MLE-26259: Release 1.1.1 README update and Chart Version update (#117)
pengzhouml Jan 12, 2026
6ce8fa2
Merge pull request #118 from barkhachoithani/feature/MLE-26527
barkhachoithani Jan 12, 2026
7bb8252
MLE-26551: remove pgrep from logging utility (#119)
pengzhouml Jan 13, 2026
d42ba79
Merge pull request #120 from marklogic/release/1.1.1
barkhachoithani Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
Copyright (c) 2024-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

Apache License
Version 2.0, January 2004
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 1.1.0
VERSION ?= 1.1.1

# VERIFY_HUGE_PAGES defines if hugepages test is enabled or not for e2e test
VERIFY_HUGE_PAGES ?= false
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MarkLogic® Operator for Kubernetes

Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
Copyright (c) 2024-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ helm repo update

2. Install or upgrade the Helm Chart for MarkLogic Operator:
```sh
helm upgrade marklogic-operator marklogic-operator/marklogic-operator-kubernetes --version=1.1.0 --install --namespace marklogic-operator-system --create-namespace
helm upgrade marklogic-operator marklogic-operator/marklogic-operator-kubernetes --version=1.1.1 --install --namespace marklogic-operator-system --create-namespace
```

3. Make sure the Marklogic Operator pod is running:
Expand Down
4 changes: 2 additions & 2 deletions charts/marklogic-operator-kubernetes/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.0
version: 1.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.1.0"
appVersion: "1.1.1"
2 changes: 1 addition & 1 deletion charts/marklogic-operator-kubernetes/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ controllerManager:
runAsNonRoot: true
image:
repository: progressofficial/marklogic-operator-kubernetes
tag: 1.1.0
tag: 1.1.1
resources:
limits:
cpu: 500m
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ kind: Kustomization
images:
- name: controller
newName: progressofficial/marklogic-operator-kubernetes
newTag: 1.1.0
newTag: 1.1.1
2 changes: 1 addition & 1 deletion pkg/k8sutil/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
// Copyright (c) 2024-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

package k8sutil

Expand Down
9 changes: 1 addition & 8 deletions pkg/k8sutil/scripts/poststart-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ else
echo "IS_BOOTSTRAP_HOST false"
fi

pid=$(pgrep start.marklogic)

###############################################################
# Logging utility
###############################################################
Expand All @@ -45,13 +43,8 @@ error() {

log () {
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
# Check to make sure pod doesn't terminate if PID value is empty for any reason
# If PID value is empty postStart hook logs are not recorded
message="${TIMESTAMP} [postStart] $@"
if [ -n "$pid" ]; then
echo $message > /proc/$pid/fd/1
fi

echo $message > /proc/1/fd/1
echo $message >> /tmp/script.log
Comment on lines +47 to 48

Copilot AI Feb 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The $message variable should be quoted to avoid word-splitting and glob expansion (which can alter log output and, in edge cases, cause unexpected behavior). Update these to use echo \"$message\" ... (or printf '%s\\n' \"$message\" ...) for stable, predictable logging.

Suggested change
echo $message > /proc/1/fd/1
echo $message >> /tmp/script.log
echo "$message" > /proc/1/fd/1
echo "$message" >> /tmp/script.log

Copilot uses AI. Check for mistakes.
}

Expand Down
7 changes: 1 addition & 6 deletions pkg/k8sutil/scripts/prestop-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@ MARKLOGIC_ADMIN_PASSWORD="$(< /run/secrets/ml-secrets/password)"

log () {
local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
# Check to make sure pod doesn't terminate if PID value is empty for any reason
# If PID value is empty preStart hook logs are not recorded
if [ -n "$pid" ]; then
echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
fi
echo "${TIMESTAMP} $@" > /proc/1/fd/1

Copilot AI Feb 9, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logging now unconditionally redirects to /proc/1/fd/1. If that FD is not writable/available in a given container environment, the redirection will fail and can cause the preStop hook to fail (potentially impacting pod termination behavior). Consider adding a safe fallback (e.g., write to stdout if the /proc/1/fd/1 write fails) or explicitly ignore redirection errors so the hook logic remains reliable.

Suggested change
echo "${TIMESTAMP} $@" > /proc/1/fd/1
echo "${TIMESTAMP} $@" > /proc/1/fd/1 2>/dev/null || echo "${TIMESTAMP} $@"

Copilot uses AI. Check for mistakes.
}

pid=$(pgrep -fn start.marklogic)
log "Info: [prestop] Prestop Hook Execution"

my_host=$(hostname -f)
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8sutil/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
// Copyright (c) 2024-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

package k8sutil

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/4_tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
// Copyright (c) 2024-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

package e2e

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/6_log_collection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2024-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
// Copyright (c) 2024-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

package e2e

Expand Down
Loading