Skip to content

Commit 566b0c2

Browse files
committed
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)
1 parent 103efe1 commit 566b0c2

12 files changed

Lines changed: 8 additions & 97 deletions

File tree

.github/ISSUE_TEMPLATE/new_version.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/normal-issue.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
3232
### Bump Rust Dependencies
3333

3434
- [ ] Bump `stackable-operator` and friends
35-
- [ ] Bump `product-config`
3635
- [ ] Bump all other dependencies

.github/workflows/general_daily_security.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,10 @@ jobs:
2020
with:
2121
persist-credentials: false
2222
- uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
23+
# Build against stable because cargo-audit sometimes depends on things
24+
# that require a newer Rust version than our pinned toolchain. This does
25+
# not influence the result, so it should be safe.
26+
env:
27+
RUSTUP_TOOLCHAIN: stable
2328
with:
2429
token: ${{ secrets.GITHUB_TOKEN }}

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,15 @@ docker-build:
2828
docker build --force-rm --build-arg VERSION=${VERSION} -t "${OCI_REGISTRY_HOSTNAME}/${OCI_REGISTRY_PROJECT_IMAGES}/${OPERATOR_NAME}:${VERSION}-${ARCH}" -f docker/Dockerfile .
2929

3030
## Chart related targets
31-
compile-chart: version crds config
31+
compile-chart: version crds
3232

3333
chart-clean:
34-
rm -rf "deploy/helm/${OPERATOR_NAME}/configs"
3534
rm -rf "deploy/helm/${OPERATOR_NAME}/crds"
3635

3736
version:
3837
cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new"
3938
mv "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new" "deploy/helm/${OPERATOR_NAME}/Chart.yaml"
4039

41-
config:
42-
if [ -d "deploy/config-spec/" ]; then\
43-
mkdir -p "deploy/helm/${OPERATOR_NAME}/configs";\
44-
cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\
45-
fi
46-
4740
# We generate a crds.yaml, so that the effect of code changes are visible.
4841
# The operator will take care of the CRD rollout itself.
4942
crds:

default.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,6 @@ rec {
151151
pkgsTarget.util-linuxMinimal
152152
];
153153
config = {
154-
Env =
155-
let
156-
fileRefVars = {
157-
PRODUCT_CONFIG = deploy/config-spec/properties.yaml;
158-
};
159-
in lib.concatLists (lib.mapAttrsToList (env: path: lib.optional (lib.pathExists path) "${env}=${path}") fileRefVars);
160154
Entrypoint = [ entrypoint ];
161155
Cmd = [ "run" ];
162156
};

deploy/config-spec/properties.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

deploy/helm/opa-operator/templates/deployment.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ spec:
1616
metadata:
1717
annotations:
1818
internal.stackable.tech/image: {{ include "operator.image" . }}
19-
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
2019
{{- with .Values.podAnnotations }}
2120
{{- toYaml . | nindent 8 }}
2221
{{- end }}
@@ -41,9 +40,6 @@ spec:
4140
imagePullPolicy: {{ .Values.image.pullPolicy }}
4241
resources:
4342
{{- toYaml .Values.resources | nindent 12 }}
44-
volumeMounts:
45-
- mountPath: /etc/stackable/{{ include "operator.appname" . }}/config-spec
46-
name: config-spec
4743
env:
4844
# The following env vars are passed as clap (think CLI) arguments to the operator.
4945
# They are picked up by clap using the structs defied in the operator.
@@ -90,10 +86,6 @@ spec:
9086
{{- include "maintenance.envVars" . | nindent 12 }}
9187
- name: OPA_BUNDLE_BUILDER_CLUSTERROLE
9288
value: {{ include "operator.fullname" . }}-opa-bundle-builder-clusterrole
93-
volumes:
94-
- name: config-spec
95-
configMap:
96-
name: {{ include "operator.fullname" . }}-configmap
9789
{{- with .Values.nodeSelector }}
9890
nodeSelector:
9991
{{- toYaml . | nindent 8 }}

0 commit comments

Comments
 (0)