chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@5c168f3

Reference-to: stackabletech/operator-templating@5c168f3 (Remove product-config)

Author: stackable-bot

.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md

@@ -32,5 +32,4 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
 ### Bump Rust Dependencies
 
 - [ ] Bump `stackable-operator` and friends
-- [ ] Bump `product-config`
 - [ ] Bump all other dependencies

.github/workflows/general_daily_security.yml

@@ -20,5 +20,10 @@ jobs:
         with:
           persist-credentials: false
       - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
+        # Build against stable because cargo-audit sometimes depends on things
+        # that require a newer Rust version than our pinned toolchain. This does
+        # not influence the result, so it should be safe.
+        env:
+          RUSTUP_TOOLCHAIN: stable
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -28,22 +28,15 @@ docker-build:
 	docker build --force-rm --build-arg VERSION=${VERSION} -t "${OCI_REGISTRY_HOSTNAME}/${OCI_REGISTRY_PROJECT_IMAGES}/${OPERATOR_NAME}:${VERSION}-${ARCH}" -f docker/Dockerfile .
 
 ## Chart related targets
-compile-chart: version crds config
+compile-chart: version crds
 
 chart-clean:
-	rm -rf "deploy/helm/${OPERATOR_NAME}/configs"
 	rm -rf "deploy/helm/${OPERATOR_NAME}/crds"
 
 version:
 	cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new"
 	mv "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new" "deploy/helm/${OPERATOR_NAME}/Chart.yaml"
 
-config:
-	if [ -d "deploy/config-spec/" ]; then\
-		mkdir -p "deploy/helm/${OPERATOR_NAME}/configs";\
-		cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\
-	fi
-
 # We generate a crds.yaml, so that the effect of code changes are visible.
 # The operator will take care of the CRD rollout itself.
 crds:

default.nix

@@ -151,12 +151,6 @@ rec {
       pkgsTarget.util-linuxMinimal
     ];
     config = {
-      Env =
-        let
-          fileRefVars = {
-            PRODUCT_CONFIG = deploy/config-spec/properties.yaml;
-          };
-        in lib.concatLists (lib.mapAttrsToList (env: path: lib.optional (lib.pathExists path) "${env}=${path}") fileRefVars);
       Entrypoint = [ entrypoint ];
       Cmd = [ "run" ];
     };

deploy/config-spec/properties.yaml

@@ -16,7 +16,6 @@ spec:
     metadata:
       annotations:
         internal.stackable.tech/image: {{ include "operator.image" . }}
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -41,9 +40,6 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - mountPath: /etc/stackable/{{ include "operator.appname" . }}/config-spec
-              name: config-spec
           env:
             # The following env vars are passed as clap (think CLI) arguments to the operator.
             # They are picked up by clap using the structs defied in the operator.
@@ -88,10 +84,6 @@ spec:
 
             {{- include "telemetry.envVars" . | nindent 12 }}
             {{- include "maintenance.envVars" . | nindent 12 }}
-      volumes:
-        - name: config-spec
-          configMap:
-            name: {{ include "operator.fullname" . }}-configmap
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/helm/opensearch-operator/configs/properties.yaml

@@ -191,8 +191,6 @@ COPY LICENSE /licenses/LICENSE
 
 COPY --from=builder --chown=${STACKABLE_USER_UID}:0 /app/* /usr/local/bin/
 
-COPY deploy/config-spec/properties.yaml /etc/stackable/opensearch-operator/config-spec/properties.yaml
-
 USER ${STACKABLE_USER_UID}
 
 ENTRYPOINT ["stackable-opensearch-operator"]

deploy/helm/opensearch-operator/templates/configmap.yaml

@@ -39,8 +39,8 @@ do
 done
 
 # Ensure this script is executable
-chmod +x "docs/modules/opensearch/examples/getting_started/getting_started.sh" \
-  || chmod +x "docs/modules/opensearch/examples/getting_started/code/getting_started.sh" \
+chmod +x "docs/modules/opensearch-operator/examples/getting_started/getting_started.sh" \
+  || chmod +x "docs/modules/opensearch-operator/examples/getting_started/code/getting_started.sh" \
   || true
 
 echo "done"