From 96a8436dd20dcf8ee724896c43db54bdc8763146 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Tue, 12 May 2026 17:39:13 +0530 Subject: [PATCH 01/12] Added dockerfile and buildscript for redis-operator --- .../Dockerfiles/v0.24.0_ubi9.7/Dockerfiles | 58 +++++ .../Dockerfiles/v0.24.0_ubi9.7/Readme | 41 ++++ r/redis-operator/LICENSE | 201 ++++++++++++++++++ r/redis-operator/build_info.json | 17 ++ r/redis-operator/redis-operator_ubi_9.7.sh | 101 +++++++++ 5 files changed, 418 insertions(+) create mode 100644 r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles create mode 100644 r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Readme create mode 100644 r/redis-operator/LICENSE create mode 100644 r/redis-operator/build_info.json create mode 100644 r/redis-operator/redis-operator_ubi_9.7.sh diff --git a/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles b/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles new file mode 100644 index 0000000000..3cfde38dd1 --- /dev/null +++ b/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles @@ -0,0 +1,58 @@ +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7 AS builder + +ARG GO_VERSION=1.26.2 +ARG TARGETOS +ARG TARGETARCH +ARG REDIS_OPERATOR_VERSION=v0.24.0 + +WORKDIR /workspace + +# Install dependencies +RUN microdnf install -y \ + wget \ + tar \ + gzip \ + git \ +&& microdnf clean all + +# Install Go +RUN wget https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz && \ + tar -C /usr/local -xf go${GO_VERSION}.linux-${TARGETARCH}.tar.gz && \ + rm -f go${GO_VERSION}.linux-${TARGETARCH}.tar.gz + +# Set Go environment +ENV GOROOT=/usr/local/go +ENV GOPATH=/root/go +ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH + +# Clone the repo and checkout version +RUN git clone https://github.com/OT-CONTAINER-KIT/redis-operator.git +WORKDIR /workspace/redis-operator +RUN git checkout $REDIS_OPERATOR_VERSION + +# Download dependencies +# Fix CVE-2026-35469 by upgrading spdystream +RUN go mod edit -require=github.com/moby/spdystream@v0.5.1 && \ + go mod download github.com/moby/spdystream && \ + go mod download + +# Build settings +ARG LDFLAGS="-s -w" + +ENV GOOS=$TARGETOS +ENV GOARCH=$TARGETARCH +ENV CGO_ENABLED=0 + +# Build binary +RUN GO111MODULE=on go build -ldflags "${LDFLAGS}" -a -o operator cmd/main.go + +# Runtime stage +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7 + +WORKDIR / + +COPY --from=builder /workspace/redis-operator/operator /operator + +USER 1001 + +ENTRYPOINT ["/operator", "manager"] \ No newline at end of file diff --git a/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Readme b/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Readme new file mode 100644 index 0000000000..508174640d --- /dev/null +++ b/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Readme @@ -0,0 +1,41 @@ +## Build and Run Instructions + +### Build the Docker Image + +```bash +docker build -t redis-operator:ppc64le . +``` + +--- + +### Run the Redis Operator Container + +```bash +docker run --rm redis-operator:ppc64le +``` + +This starts the Redis Operator using the default entrypoint: + +```text +/operator manager +``` + +--- + +### Open an Interactive Shell Inside the Container + +```bash +docker run -it --user root --entrypoint /bin/bash redis-operator:ppc64le +``` + +This launches an interactive shell for debugging or inspection. + +--- + +## Notes + +- The Dockerfile automatically: + - Clones the Redis Operator source repository + - Checks out version `v0.24.0` + - Builds the operator binary +- No local source code checkout is required before building the image. \ No newline at end of file diff --git a/r/redis-operator/LICENSE b/r/redis-operator/LICENSE new file mode 100644 index 0000000000..8dada3edaf --- /dev/null +++ b/r/redis-operator/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/r/redis-operator/build_info.json b/r/redis-operator/build_info.json new file mode 100644 index 0000000000..42735aba95 --- /dev/null +++ b/r/redis-operator/build_info.json @@ -0,0 +1,17 @@ +{ + "maintainer": "rusiyamanya", + "package_name": "redis-operator", + "github_url": "https://github.com/OT-CONTAINER-KIT/redis-operator", + "version": "v0.24.0", + "default_branch": "main", + "package_dir": "r/redisearch", + "docker_cmd": "docker build -t ${package_name}:$PACKAGE_VERSION ${dir}", + "build_script": "redis-operator_ubi_9.7.sh", + "validate_build_script": "true", + "use_non_root_user": "true", + "docker_build": "true", + "v0.24.0": { + "dir": "0.24.0_ubi_9.7", + "build_script": "redis-operator_ubi_9.7.sh" + } +} diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh new file mode 100644 index 0000000000..1d3f707667 --- /dev/null +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -0,0 +1,101 @@ +#!/bin/bash -ex +# ----------------------------------------------------------------------------- +# +# Package : redis-operator +# Version : v0.24.0 +# Source repo : https://github.com/OT-CONTAINER-KIT/redis-operator +# Tested on : UBI:9.7 +# Ci-Check : True +# Language : GO +# Script License: Apache License, Version 2 or later +# Maintainer : Manya Rusiya +# +# Disclaimer : This script has been tested in non-root mode on given +# ========== platform using the mentioned version of the package. +# It may not work as expected with newer versions of the +# package and/or distribution. In such case, please +# contact "Maintainer" of this script. +# ----------------------------------------------------------------------------- + +PACKAGE_NAME=redis-operator +PACKAGE_VERSION=${1:-v0.24.0} +PACKAGE_URL=https://github.com/OT-CONTAINER-KIT/redis-operator +PACKAGE_DIR=redis-operator +WORKDIR=$(pwd) + +# Install system dependencies +echo ">>> Installing System Dependencies" +sudo yum install -y \ + git make wget gcc gcc-c++ tar + +# Install GO +export GO_VERSION=${GO_VERSION:-1.23.4} +export GOROOT=${GOROOT:-"/usr/local/go"} +export GOPATH=${GOPATH:-$HOME/go} +export PATH=$PATH:$GOROOT/bin:$GOPATH/bin:/usr/local/bin +echo ">>> Installing GO" +wget https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz +sudo tar -C /usr/local -xvzf go${GO_VERSION}.linux-ppc64le.tar.gz +rm -rf go${GO_VERSION}.linux-ppc64le.tar.gz + +# Clone the repository +cd $WORKDIR +git clone $PACKAGE_URL +cd $PACKAGE_DIR && git checkout $PACKAGE_VERSION + +go mod tidy + +# Build the binary +echo ">>> Building binary" +ret=0 +make manager || ret=$? +if [ $ret -ne 0 ]; then + echo "---------------- $PACKAGE_NAME: Build Failed ----------------" + exit 1 +else + echo "---------------- $PACKAGE_NAME: Build Successfull ----------------" +fi + +# Verify the binary exists +echo ">>> Verifying binary" +if [ -f "bin/manager" ]; then + echo ">>> Binary exists" +else + echo ">>> Binary not found" + exit 1 +fi +# Install setup-envtest and configure Kubernetes envtest assets for running tests +go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest +setup-envtest use 1.29.0 -p path +export KUBEBUILDER_ASSETS=$(setup-envtest use 1.29.0 -p path) + +# Unit tests +echo ">>> Running Unit Tests" +ret=0 +make unit-tests || ret=$? +if [ $ret -ne 0 ]; then + echo "---------------- $PACKAGE_NAME: Unit Tests Failed ----------------" + exit 1 +else + echo "---------------- $PACKAGE_NAME: Unit Tests Successfull ----------------" +fi +# Integration tests +echo ">>> Running Integration Test Setup and Tests" +ret=0 +make integration-test-setup || ret=$? +if [ $ret -ne 0 ]; then + echo "---------------- $PACKAGE_NAME: Integration Test Setup Failed ----------------" + exit 1 +else + echo "---------------- $PACKAGE_NAME: Integration Test Setup Successfull ----------------" +fi +make integration-tests || ret=$? +if [ $ret -ne 0 ]; then + echo "---------------- $PACKAGE_NAME: Integration Test Failed ----------------" + exit 1 +else + echo "---------------- $PACKAGE_NAME: Integration Test Sucessfull ----------------" +fi + +echo "---------------- $PACKAGE_NAME:$PACKAGE_VERSION Build and Test Successfull----------------" +exit 0 \ No newline at end of file From f7f4f06fa5b0670a85d13860357376b0cf6c85b6 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Tue, 12 May 2026 18:16:56 +0530 Subject: [PATCH 02/12] Update build_info.json --- r/redis-operator/build_info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/redis-operator/build_info.json b/r/redis-operator/build_info.json index 42735aba95..b9946d0ecd 100644 --- a/r/redis-operator/build_info.json +++ b/r/redis-operator/build_info.json @@ -4,7 +4,7 @@ "github_url": "https://github.com/OT-CONTAINER-KIT/redis-operator", "version": "v0.24.0", "default_branch": "main", - "package_dir": "r/redisearch", + "package_dir": "r/redis-operator", "docker_cmd": "docker build -t ${package_name}:$PACKAGE_VERSION ${dir}", "build_script": "redis-operator_ubi_9.7.sh", "validate_build_script": "true", From 65b6ee82d0a2f1cee154ece0f378d4c20b81d7d6 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Tue, 12 May 2026 18:36:16 +0530 Subject: [PATCH 03/12] Add environment variable setup for Go installation Set default values for GO_VERSION, GOROOT, and GOPATH. --- r/redis-operator/redis-operator_ubi_9.7.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index 1d3f707667..be4b36091d 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -29,6 +29,7 @@ sudo yum install -y \ git make wget gcc gcc-c++ tar # Install GO +cd /tmp export GO_VERSION=${GO_VERSION:-1.23.4} export GOROOT=${GOROOT:-"/usr/local/go"} export GOPATH=${GOPATH:-$HOME/go} @@ -98,4 +99,4 @@ else fi echo "---------------- $PACKAGE_NAME:$PACKAGE_VERSION Build and Test Successfull----------------" -exit 0 \ No newline at end of file +exit 0 From fc97537dbc7214d9507385c274b28f1a6fa595f1 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Tue, 12 May 2026 18:44:59 +0530 Subject: [PATCH 04/12] Update working directory for repository cloning Change working directory to HOME before cloning the repository. --- r/redis-operator/redis-operator_ubi_9.7.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index be4b36091d..b07ca9fd89 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -21,7 +21,6 @@ PACKAGE_NAME=redis-operator PACKAGE_VERSION=${1:-v0.24.0} PACKAGE_URL=https://github.com/OT-CONTAINER-KIT/redis-operator PACKAGE_DIR=redis-operator -WORKDIR=$(pwd) # Install system dependencies echo ">>> Installing System Dependencies" @@ -40,7 +39,7 @@ sudo tar -C /usr/local -xvzf go${GO_VERSION}.linux-ppc64le.tar.gz rm -rf go${GO_VERSION}.linux-ppc64le.tar.gz # Clone the repository -cd $WORKDIR +cd $HOME git clone $PACKAGE_URL cd $PACKAGE_DIR && git checkout $PACKAGE_VERSION From 8b13201bdab7d507e8c6004f0c80deb535123f7f Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 10:13:21 +0530 Subject: [PATCH 05/12] Update directory for repository cloning Change working directory to /tmp before cloning the repository. --- r/redis-operator/redis-operator_ubi_9.7.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index b07ca9fd89..674064b6c4 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -39,7 +39,8 @@ sudo tar -C /usr/local -xvzf go${GO_VERSION}.linux-ppc64le.tar.gz rm -rf go${GO_VERSION}.linux-ppc64le.tar.gz # Clone the repository -cd $HOME +cd /tmp +rm -rf $PACKAGE_DIR git clone $PACKAGE_URL cd $PACKAGE_DIR && git checkout $PACKAGE_VERSION From 3f00be1de791bfd9882a8f1da33b44104a93e927 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 10:18:08 +0530 Subject: [PATCH 06/12] Update redis-operator script for user permissions and path Changed directory for cloning the repository to the user's home directory and added ownership change for a directory. --- r/redis-operator/redis-operator_ubi_9.7.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index 674064b6c4..d4493ea61f 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -22,6 +22,8 @@ PACKAGE_VERSION=${1:-v0.24.0} PACKAGE_URL=https://github.com/OT-CONTAINER-KIT/redis-operator PACKAGE_DIR=redis-operator +sudo chown -R test_user:test_user /home/tester + # Install system dependencies echo ">>> Installing System Dependencies" sudo yum install -y \ @@ -39,8 +41,7 @@ sudo tar -C /usr/local -xvzf go${GO_VERSION}.linux-ppc64le.tar.gz rm -rf go${GO_VERSION}.linux-ppc64le.tar.gz # Clone the repository -cd /tmp -rm -rf $PACKAGE_DIR +cd $HOME git clone $PACKAGE_URL cd $PACKAGE_DIR && git checkout $PACKAGE_VERSION From c07fc8bd75476cb842fdbf726c6aadf91948f70a Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 10:41:51 +0530 Subject: [PATCH 07/12] Add USER environment variable setup Set USER environment variable with a default value. --- r/redis-operator/redis-operator_ubi_9.7.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index d4493ea61f..71e8072349 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -68,6 +68,7 @@ else fi # Install setup-envtest and configure Kubernetes envtest assets for running tests go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest +export USER=${USER:-tester} setup-envtest use 1.29.0 -p path export KUBEBUILDER_ASSETS=$(setup-envtest use 1.29.0 -p path) From ec29ab8ab479a46077f064e0759f2a99d6b21b60 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 11:00:50 +0530 Subject: [PATCH 08/12] Ensure 'tester' user is created and set USER variable Add user 'tester' if it does not exist and set USER environment variable. --- r/redis-operator/redis-operator_ubi_9.7.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index 71e8072349..33b37feaee 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -68,7 +68,8 @@ else fi # Install setup-envtest and configure Kubernetes envtest assets for running tests go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest -export USER=${USER:-tester} +id tester &>/dev/null || sudo useradd -m tester +export USER=tester setup-envtest use 1.29.0 -p path export KUBEBUILDER_ASSETS=$(setup-envtest use 1.29.0 -p path) From 896a9db3f0403215fbe2389a9ee2166f0a227986 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 12:27:59 +0530 Subject: [PATCH 09/12] Refactor redis-operator installation script Updated ownership command to use current user and adjusted working directory for cloning the repository. Configured setup-envtest to use a user-writable directory for Kubernetes assets. --- r/redis-operator/redis-operator_ubi_9.7.sh | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index 33b37feaee..df53608725 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -21,8 +21,9 @@ PACKAGE_NAME=redis-operator PACKAGE_VERSION=${1:-v0.24.0} PACKAGE_URL=https://github.com/OT-CONTAINER-KIT/redis-operator PACKAGE_DIR=redis-operator +WORKDIR=$(pwd) -sudo chown -R test_user:test_user /home/tester +sudo chown -R $(whoami):$(whoami) $HOME || true # Install system dependencies echo ">>> Installing System Dependencies" @@ -30,7 +31,6 @@ sudo yum install -y \ git make wget gcc gcc-c++ tar # Install GO -cd /tmp export GO_VERSION=${GO_VERSION:-1.23.4} export GOROOT=${GOROOT:-"/usr/local/go"} export GOPATH=${GOPATH:-$HOME/go} @@ -41,7 +41,7 @@ sudo tar -C /usr/local -xvzf go${GO_VERSION}.linux-ppc64le.tar.gz rm -rf go${GO_VERSION}.linux-ppc64le.tar.gz # Clone the repository -cd $HOME +cd $WORKDIR git clone $PACKAGE_URL cd $PACKAGE_DIR && git checkout $PACKAGE_VERSION @@ -66,12 +66,25 @@ else echo ">>> Binary not found" exit 1 fi + # Install setup-envtest and configure Kubernetes envtest assets for running tests +echo ">>> Installing setup-envtest" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest -id tester &>/dev/null || sudo useradd -m tester -export USER=tester -setup-envtest use 1.29.0 -p path -export KUBEBUILDER_ASSETS=$(setup-envtest use 1.29.0 -p path) + +# Create a user-writable directory for kubebuilder assets +export KUBEBUILDER_ASSETS_DIR=$HOME/.kubebuilder +mkdir -p $KUBEBUILDER_ASSETS_DIR + +# Configure setup-envtest to use the user-writable directory +echo ">>> Setting up envtest with Kubernetes 1.29.0" +export KUBEBUILDER_ASSETS=$(setup-envtest use 1.29.0 -p path --bin-dir $KUBEBUILDER_ASSETS_DIR) + +# Verify KUBEBUILDER_ASSETS is set +if [ -z "$KUBEBUILDER_ASSETS" ]; then + echo ">>> Failed to set KUBEBUILDER_ASSETS" + exit 1 +fi +echo ">>> KUBEBUILDER_ASSETS set to: $KUBEBUILDER_ASSETS" # Unit tests echo ">>> Running Unit Tests" From 072b2466d281686964060dfe41e7b2f935036999 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 12:46:32 +0530 Subject: [PATCH 10/12] Add USER environment variable for integration tests Set USER environment variable if not already set. --- r/redis-operator/redis-operator_ubi_9.7.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/r/redis-operator/redis-operator_ubi_9.7.sh b/r/redis-operator/redis-operator_ubi_9.7.sh index df53608725..c605f0073f 100644 --- a/r/redis-operator/redis-operator_ubi_9.7.sh +++ b/r/redis-operator/redis-operator_ubi_9.7.sh @@ -86,6 +86,10 @@ if [ -z "$KUBEBUILDER_ASSETS" ]; then fi echo ">>> KUBEBUILDER_ASSETS set to: $KUBEBUILDER_ASSETS" +# Set USER environment variable if not set (required by integration test scripts) +export USER=${USER:-$(whoami)} +echo ">>> USER set to: $USER" + # Unit tests echo ">>> Running Unit Tests" ret=0 From a394accd3ebcd8ef76912f7e5a7edb6779328487 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 16:23:02 +0530 Subject: [PATCH 11/12] Rename Dockerfiles to Dockerfile --- .../Dockerfiles/v0.24.0_ubi9.7/{Dockerfiles => Dockerfile} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/{Dockerfiles => Dockerfile} (97%) diff --git a/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles b/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfile similarity index 97% rename from r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles rename to r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfile index 3cfde38dd1..0462c6069a 100644 --- a/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfiles +++ b/r/redis-operator/Dockerfiles/v0.24.0_ubi9.7/Dockerfile @@ -55,4 +55,4 @@ COPY --from=builder /workspace/redis-operator/operator /operator USER 1001 -ENTRYPOINT ["/operator", "manager"] \ No newline at end of file +ENTRYPOINT ["/operator", "manager"] From 09fb4e8d42ba5f1c4d4d91c491e220ec62ead8b8 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Wed, 13 May 2026 16:27:27 +0530 Subject: [PATCH 12/12] Update build directory format for version 0.24.0 --- r/redis-operator/build_info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/redis-operator/build_info.json b/r/redis-operator/build_info.json index b9946d0ecd..5d57d192db 100644 --- a/r/redis-operator/build_info.json +++ b/r/redis-operator/build_info.json @@ -11,7 +11,7 @@ "use_non_root_user": "true", "docker_build": "true", "v0.24.0": { - "dir": "0.24.0_ubi_9.7", + "dir": "v0.24.0_ubi9.7", "build_script": "redis-operator_ubi_9.7.sh" } }