Skip to content

Commit 1459d17

Browse files
authored
chore: add oci references, merge templating changes (#561)
* replace repo urls * bump stackable-operator version and add changelog entry
1 parent 82dadf5 commit 1459d17

File tree

18 files changed

+48
-43
lines changed

18 files changed

+48
-43
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ All notable changes to this project will be documented in this file.
99
- Run a `containerdebug` process in the background of each Hive container to collect debugging information ([#554]).
1010
- Aggregate emitted Kubernetes events on the CustomResources ([#560]).
1111

12+
### Changed
13+
14+
- Default to OCI for image metadata and product image selection ([#561]).
15+
1216
[#554]: https://github.com/stackabletech/hive-operator/pull/554
1317
[#560]: https://github.com/stackabletech/hive-operator/pull/560
18+
[#561]: https://github.com/stackabletech/hive-operator/pull/561
1419

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

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: 7 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
@@ -24,7 +24,7 @@ serde = { version = "1.0", features = ["derive"] }
2424
serde_json = "1.0"
2525
serde_yaml = "0.9"
2626
snafu = "0.8"
27-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1" }
27+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
2828
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
2929
strum = { version = "0.26", features = ["derive"] }
3030
tokio = { version = "1.40", features = ["full"] }

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/hive-operator/crds/crds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ spec:
238238
Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details.
239239
properties:
240240
custom:
241-
description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
241+
description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
242242
type: string
243243
productVersion:
244244
description: Version of the product, e.g. `1.4.1`.
@@ -265,7 +265,7 @@ spec:
265265
nullable: true
266266
type: array
267267
repo:
268-
description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
268+
description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
269269
nullable: true
270270
type: string
271271
stackableVersion:

deploy/helm/hive-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 hive-operator.
22
---
33
image:
4-
repository: docker.stackable.tech/stackable/hive-operator
4+
repository: oci.stackable.tech/sdp/hive-operator
55
pullPolicy: IfNotPresent
66
pullSecrets: []
77

docs/modules/hive/examples/getting_started/hive-test-helper.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ spec:
1818
spec:
1919
containers:
2020
- name: hive-test-helper
21-
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
21+
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
2222
stdin: true
2323
tty: true

docs/modules/hive/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/hive-operator:latest
33+
oci.stackable.tech/sdp/hive-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/hive-operator:latest
59+
oci.stackable.tech/sdp/hive-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/hive-operator:latest
88+
oci.stackable.tech/sdp/hive-operator:0.0.0-dev
8989
----

docs/modules/hive/pages/usage-guide/database-driver.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
claimName: pvc-hive-drivers
5454
initContainers:
5555
- name: dest-dir
56-
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.3.0
56+
image: oci.stackable.tech/sdp/tools:1.0.0-stackable24.3.0
5757
env:
5858
- name: DEST_DIR
5959
value: "/stackable/externals"
@@ -71,7 +71,7 @@ spec:
7171
mountPath: /stackable/externals
7272
containers:
7373
- name: hive-driver
74-
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.3.0
74+
image: oci.stackable.tech/sdp/tools:1.0.0-stackable24.3.0
7575
env:
7676
- name: DEST_DIR
7777
value: "/stackable/externals"
@@ -109,7 +109,7 @@ spec:
109109
claimName: pvc-hive-drivers
110110
containers:
111111
- name: hive-driver
112-
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.3.0
112+
image: oci.stackable.tech/sdp/tools:1.0.0-stackable24.3.0
113113
env:
114114
- name: DEST_DIR
115115
value: "/stackable/externals"
@@ -195,15 +195,15 @@ If you have access to a registry to store custom images, another approach is to
195195
.Copy the driver
196196
[source]
197197
----
198-
FROM docker.stackable.tech/stackable/hive:4.0.0-stackable0.0.0-dev
198+
FROM oci.stackable.tech/sdp/hive:4.0.0-stackable0.0.0-dev
199199
200200
RUN curl --fail -L https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.31/mysql-connector-j-8.0.31.jar -o /stackable/mysql-connector-j-8.0.31.jar
201201
----
202202

203203
.Build and tag the image
204204
[source]
205205
----
206-
docker build -f ./Dockerfile -t docker.stackable.tech/stackable/hive:4.0.0-stackable0.0.0-dev-mysql .
206+
docker build -f ./Dockerfile -t oci.stackable.tech/sdp/hive:4.0.0-stackable0.0.0-dev-mysql .
207207
----
208208

209209
.Reference the new path to the driver without the need for using a volume mounted from a PVC
@@ -216,7 +216,7 @@ metadata:
216216
name: hive
217217
spec:
218218
image:
219-
custom: docker.stackable.tech/stackable/hive:4.0.0-stackable0.0.0-dev-mysql # <1>
219+
custom: oci.stackable.tech/sdp/hive:4.0.0-stackable0.0.0-dev-mysql # <1>
220220
productVersion: 4.0.0
221221
clusterConfig:
222222
database:

0 commit comments

Comments
 (0)