diff --git a/LICENSE b/LICENSE index 9eb906e3..434fb0fe 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/Makefile b/Makefile index 56edcc59..0349d5fd 100755 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/NOTICE.txt b/NOTICE.txt index 395f6271..e348ad4a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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 diff --git a/README.md b/README.md index e26fd183..5a6c674b 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/charts/marklogic-operator-kubernetes/Chart.yaml b/charts/marklogic-operator-kubernetes/Chart.yaml index 65726708..e1495047 100644 --- a/charts/marklogic-operator-kubernetes/Chart.yaml +++ b/charts/marklogic-operator-kubernetes/Chart.yaml @@ -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" diff --git a/charts/marklogic-operator-kubernetes/values.yaml b/charts/marklogic-operator-kubernetes/values.yaml index b77e9dfd..8082ded1 100644 --- a/charts/marklogic-operator-kubernetes/values.yaml +++ b/charts/marklogic-operator-kubernetes/values.yaml @@ -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 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a3a364a5..705f89f5 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -7,4 +7,4 @@ kind: Kustomization images: - name: controller newName: progressofficial/marklogic-operator-kubernetes - newTag: 1.1.0 + newTag: 1.1.1 diff --git a/pkg/k8sutil/configmap.go b/pkg/k8sutil/configmap.go index 3908d928..2f59c1ce 100644 --- a/pkg/k8sutil/configmap.go +++ b/pkg/k8sutil/configmap.go @@ -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 diff --git a/pkg/k8sutil/scripts/poststart-hook.sh b/pkg/k8sutil/scripts/poststart-hook.sh index 7febcbcd..7230bdb8 100644 --- a/pkg/k8sutil/scripts/poststart-hook.sh +++ b/pkg/k8sutil/scripts/poststart-hook.sh @@ -25,8 +25,6 @@ else echo "IS_BOOTSTRAP_HOST false" fi -pid=$(pgrep start.marklogic) - ############################################################### # Logging utility ############################################################### @@ -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 } diff --git a/pkg/k8sutil/scripts/prestop-hook.sh b/pkg/k8sutil/scripts/prestop-hook.sh index f3f828fd..b649bbd7 100644 --- a/pkg/k8sutil/scripts/prestop-hook.sh +++ b/pkg/k8sutil/scripts/prestop-hook.sh @@ -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 } -pid=$(pgrep -fn start.marklogic) log "Info: [prestop] Prestop Hook Execution" my_host=$(hostname -f) diff --git a/pkg/k8sutil/statefulset.go b/pkg/k8sutil/statefulset.go index 513ade78..47170e1d 100644 --- a/pkg/k8sutil/statefulset.go +++ b/pkg/k8sutil/statefulset.go @@ -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 diff --git a/test/e2e/4_tls_test.go b/test/e2e/4_tls_test.go index 921d70f1..f7798374 100644 --- a/test/e2e/4_tls_test.go +++ b/test/e2e/4_tls_test.go @@ -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 diff --git a/test/e2e/6_log_collection_test.go b/test/e2e/6_log_collection_test.go index 558b161e..94382265 100644 --- a/test/e2e/6_log_collection_test.go +++ b/test/e2e/6_log_collection_test.go @@ -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