Skip to content

Commit 7110c37

Browse files
authored
chore: add oci references, merge templating changes (#741)
* replace repo urls * bump stackable-operator version and add changelog entry
1 parent 6dc7a56 commit 7110c37

File tree

15 files changed

+39
-30
lines changed

15 files changed

+39
-30
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ All notable changes to this project will be documented in this file.
1212
- Support configuring JVM arguments ([#724]).
1313
- Aggregate emitted Kubernetes events on the CustomResources ([#742]).
1414

15+
### Changed
16+
17+
- Default to OCI for image metadata and product image selection ([#741]).
18+
1519
[#722]: https://github.com/stackabletech/nifi-operator/pull/722
1620
[#724]: https://github.com/stackabletech/nifi-operator/pull/724
1721
[#730]: https://github.com/stackabletech/nifi-operator/pull/730
22+
[#741]: https://github.com/stackabletech/nifi-operator/pull/741
1823
[#742]: https://github.com/stackabletech/nifi-operator/pull/742
1924

2025
## [24.11.1] - 2025-01-10

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 11 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ serde = { version = "1.0", features = ["derive"] }
2626
serde_json = "1.0"
2727
serde_yaml = "0.9"
2828
snafu = "0.8"
29-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1" }
29+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
3030
strum = { version = "0.26", features = ["derive"] }
3131
tokio = { version = "1.40", features = ["full"] }
3232
tracing = "0.1"

crate-hashes.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/helm/nifi-operator/crds/crds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ spec:
193193
Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details.
194194
properties:
195195
custom:
196-
description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
196+
description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
197197
type: string
198198
productVersion:
199199
description: Version of the product, e.g. `1.4.1`.
@@ -220,7 +220,7 @@ spec:
220220
nullable: true
221221
type: array
222222
repo:
223-
description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
223+
description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
224224
nullable: true
225225
type: string
226226
stackableVersion:

deploy/helm/nifi-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Default values for nifi-operator.
22
---
33
image:
4-
repository: docker.stackable.tech/stackable/nifi-operator
4+
repository: oci.stackable.tech/sdp/nifi-operator
55
pullPolicy: IfNotPresent
66
pullSecrets: []
77

docs/modules/nifi/pages/reference/environment-variables.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ docker run \
3030
--env KUBECONFIG=/home/stackable/.kube/config \
3131
--env KUBERNETES_CLUSTER_DOMAIN=mycluster.local \
3232
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
33-
docker.stackable.tech/stackable/nifi-operator:latest
33+
oci.stackable.tech/sdp/nifi-operator:0.0.0-dev
3434
----
3535

3636
== PRODUCT_CONFIG
@@ -56,7 +56,7 @@ docker run \
5656
--env KUBECONFIG=/home/stackable/.kube/config \
5757
--env PRODUCT_CONFIG=/my/product/config.yaml \
5858
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
59-
docker.stackable.tech/stackable/nifi-operator:latest
59+
oci.stackable.tech/sdp/nifi-operator:0.0.0-dev
6060
----
6161

6262
== WATCH_NAMESPACE
@@ -85,5 +85,5 @@ docker run \
8585
--env KUBECONFIG=/home/stackable/.kube/config \
8686
--env WATCH_NAMESPACE=test \
8787
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
88-
docker.stackable.tech/stackable/nifi-operator:latest
88+
oci.stackable.tech/sdp/nifi-operator:0.0.0-dev
8989
----

docs/modules/nifi/pages/usage_guide/custom_processors.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The basic Dockerfile below shows how to achieve this:
1919

2020
[source,Dockerfile]
2121
----
22-
FROM docker.stackable.tech/stackable/nifi:1.27.0-stackable0.0.0-dev
22+
FROM oci.stackable.tech/sdp/nifi:1.27.0-stackable0.0.0-dev
2323
COPY /path/to/your/nar.file /stackable/nifi/lib/
2424
----
2525

tests/templates/kuttl/ldap/03-install-test-nifi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ spec:
1717
spec:
1818
containers:
1919
- name: test-nifi
20-
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
20+
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
2121
command: ["sleep", "infinity"]

0 commit comments

Comments
 (0)