Skip to content

Commit 12d7873

Browse files
Pipeline and documentation fixes (#1575)
* fix doc links and distroless build * remove extra quote * remove make tidy, update operator sdk version in bundle
1 parent d8cbfb0 commit 12d7873

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

.github/workflows/distroless-build-test-push-workflow.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ jobs:
9494
uses: aws-actions/amazon-ecr-login@v1
9595
- name: Build and push Splunk Operator Image
9696
run: |
97-
make docker-buildx IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless
97+
export BASE_IMAGE=gcr.io/distroless/static-debian12
98+
export BASE_IMAGE_VERSION=latest
99+
make docker-buildx BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless
98100
- name: Sign Splunk Operator image with a key
99101
run: |
100102
cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }}-distroless

.github/workflows/merge-develop-to-main-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
# Build and push Distroless image
101101
- name: Build and push Distroless Image
102102
run: |
103-
make docker-buildx IMG=${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} BASE_IMAGE=gcr.io/distroless/static BASE_IMAGE_VERSION=latest
103+
make docker-buildx IMG=${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }}-distroless BASE_IMAGE=gcr.io/distroless/static BASE_IMAGE_VERSION=latest
104104
105105
- name: Tag and Push Default UBI RC Image
106106
run: |

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,13 @@ docker-buildx:
174174
docker buildx use project-v3-builder; \
175175
if echo "${BASE_IMAGE}" | grep -q "distroless"; then \
176176
DOCKERFILE="Dockerfile.distroless"; \
177-
BUILD_TAG="${IMG}-distroless"; \
178177
else \
179178
DOCKERFILE="Dockerfile"; \
180-
BUILD_TAG="${IMG}"; \
181179
fi; \
182180
docker buildx build --push --platform="${PLATFORMS}" \
183181
--build-arg BASE_IMAGE="${BASE_IMAGE}" \
184182
--build-arg BASE_IMAGE_VERSION="${BASE_IMAGE_VERSION}" \
185-
--tag "$$BUILD_TAG" -f "$$DOCKERFILE" .; \
183+
--tag "${IMG}" -f "$$DOCKERFILE" .; \
186184
- docker buildx rm project-v3-builder || true
187185

188186

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ The [Kubernetes Operator SDK](https://github.com/operator-framework/operator-sdk
5050
must also be installed to build this project.
5151

5252
```
53-
git clone -b v1.31.0 https://github.com/operator-framework/operator-sdk
53+
git clone -b v1.39.0 https://github.com/operator-framework/operator-sdk
5454
cd operator-sdk
55-
make tidy
5655
make install
5756
```
5857

bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=splunk-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=stable
99
LABEL operators.operatorframework.io.bundle.channel.default.v1: stable
10-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
10+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1313

docs/AppFramework.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Utilizing the App Framework requires one of the following remote storage provide
2222

2323
### Prerequisites for Azure Blob remote object storage
2424
* The remote object storage credentials provided as a kubernetes secret.
25-
* OR, Use "Managed Indentity" role assigment to the Azure blob container. See [Setup Azure bob access with Managed Indentity](#setup-azure-bob-access-with-managed-indentity)
25+
* OR, Use "Managed Identity" role assigment to the Azure blob container. See [Setup Azure blob access with Managed Identity](#setup-azure-blob-access-with-managed-identity)
2626

2727
### Prerequisites for GCP bucket based remote object storage
2828
To use GCP storage in the App Framework, follow these setup requirements:
@@ -63,7 +63,7 @@ In this example, you'll deploy a Standalone CR with a remote storage volume, the
6363
* Or, create a Kubernetes Secret Object with the static storage credentials.
6464
* Example: `kubectl create secret generic s3-secret --from-literal=s3_access_key=AKIAIOSFODNN7EXAMPLE --from-literal=s3_secret_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLE_S3_SECRET_KEY`
6565
* azure blob:
66-
* Configuring an IAM through "Managed Indentity" role assigment to give read access for your bucket (azure blob container). For more details see [Setup Azure bob access with Managed Indentity](#setup-azure-bob-access-with-managed-indentity)
66+
* Configuring an IAM through "Managed Identity" role assigment to give read access for your bucket (azure blob container). For more details see [Setup Azure blob access with Managed Identity](#setup-azure-blob-access-with-managed-identity)
6767
* Or, create a Kubernetes Secret Object with the static storage credentials.
6868
* Example: `kubectl create secret generic azureblob-secret --from-literal=azure_sa_name=mystorageaccount --from-literal=azure_sa_secret_key=wJalrXUtnFEMI/K7MDENG/EXAMPLE_AZURE_SHARED_ACCESS_KEY`
6969
* GCP bucket:
@@ -195,7 +195,7 @@ This example describes the installation of apps on an Indexer Cluster and Cluste
195195
* Or, create a Kubernetes Secret Object with the static storage credentials.
196196
* Example: `kubectl create secret generic s3-secret --from-literal=s3_access_key=AKIAIOSFODNN7EXAMPLE --from-literal=s3_secret_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLE_S3_SECRET_KEY`
197197
* azure blob:
198-
* Configuring an IAM through "Managed Indentity" role assigment to give read access for your bucket (azure blob container). For more details see [Setup Azure bob access with Managed Indentity](#setup-azure-bob-access-with-managed-indentity)
198+
* Configuring an IAM through "Managed Identity" role assigment to give read access for your bucket (azure blob container). For more details see [Setup Azure blob access with Managed Identity](#setup-azure-blob-access-with-managed-identity)
199199
* Or, create a Kubernetes Secret Object with the static storage credentials.
200200
* Example: `kubectl create secret generic azureblob-secret --from-literal=azure_sa_name=mystorageaccount --from-literal=azure_sa_secret_key=wJalrXUtnFEMI/K7MDENG/EXAMPLE_AZURE_SHARED_ACCESS_KEY`
201201
* GCP bucket:
@@ -342,7 +342,7 @@ This example describes the installation of apps on the Deployer and the Search H
342342
* Or, create a Kubernetes Secret Object with the static storage credentials.
343343
* Example: `kubectl create secret generic s3-secret --from-literal=s3_access_key=AKIAIOSFODNN7EXAMPLE --from-literal=s3_secret_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLE_S3_SECRET_KEY`
344344
* azure blob:
345-
* Configuring an IAM through "Managed Indentity" role assigment to give read access for your bucket (azure blob container). For more details see [Setup Azure bob access with Managed Indentity](#setup-azure-bob-access-with-managed-indentity)
345+
* Configuring an IAM through "Managed Identity" role assigment to give read access for your bucket (azure blob container). For more details see [Setup Azure blob access with Managed Identity](#setup-azure-blob-access-with-managed-identity)
346346
* Or, create a Kubernetes Secret Object with the static storage credentials.
347347
* Example: `kubectl create secret generic azureblob-secret --from-literal=azure_sa_name=mystorageaccount --from-literal=azure_sa_secret_key=wJalrXUtnFEMI/K7MDENG/EXAMPLE_AZURE_SHARED_ACCESS_KEY`
348348
* GCP bucket:

docs/Examples.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,8 @@ spec:
699699
defaultsUrl: /mnt/license-manager/default.yml
700700
```
701701
702+
In the case of an indexer cluster, default.yml will need configuration on the cluster manager custom resource and all indexer cluster custom resource(s).
703+
702704
## Using an External Indexer Cluster
703705
704706
*Note that this requires using the Splunk Enterprise container version 8.1.0 or later*

docs/Ingress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ We provide some examples below for configuring a few of the most popular Ingress
2323

2424
* [Configuring Ingress Using Istio](#Configuring-Ingress-Using-Istio)
2525
* [Configuring Ingress Using NGINX](#Configuring-Ingress-Using-NGINX)
26-
* [Using Let's Encrypt to manage TLS certificates ](#installing-the-splunk-operator)
26+
* [Using Let's Encrypt to manage TLS certificates](#using-lets-encrypt-to-manage-tls-certificates)
2727

2828

2929
Before deploying an example, you will need to review the yaml and replace “example.com” with the domain name you would like to use and replace “example” in the service names with the name of your custom resource object. You will also need to point your DNS for all the desired hostnames to the IP addresses of your ingress load balancer.

0 commit comments

Comments
 (0)