Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add oci references, merge templating changes #561

Merged
merged 4 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ All notable changes to this project will be documented in this file.
- Run a `containerdebug` process in the background of each Hive container to collect debugging information ([#554]).
- Aggregate emitted Kubernetes events on the CustomResources ([#560]).

### Changed

- Default to OCI for image metadata and product image selection ([#561]).

[#554]: https://github.com/stackabletech/hive-operator/pull/554
[#560]: https://github.com/stackabletech/hive-operator/pull/560
[#561]: https://github.com/stackabletech/hive-operator/pull/561

## [24.11.1] - 2025-01-10

Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_yaml = "0.9"
snafu = "0.8"
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
strum = { version = "0.26", features = ["derive"] }
tokio = { version = "1.40", features = ["full"] }
Expand Down
6 changes: 3 additions & 3 deletions crate-hashes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deploy/helm/hive-operator/crds/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ spec:
Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details.
properties:
custom:
description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
type: string
productVersion:
description: Version of the product, e.g. `1.4.1`.
Expand All @@ -265,7 +265,7 @@ spec:
nullable: true
type: array
repo:
description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
nullable: true
type: string
stackableVersion:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/hive-operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Default values for hive-operator.
---
image:
repository: docker.stackable.tech/stackable/hive-operator
repository: oci.stackable.tech/sdp/hive-operator
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: hive-test-helper
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
stdin: true
tty: true
6 changes: 3 additions & 3 deletions docs/modules/hive/pages/reference/environment-variables.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ docker run \
--env KUBECONFIG=/home/stackable/.kube/config \
--env KUBERNETES_CLUSTER_DOMAIN=mycluster.local \
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
docker.stackable.tech/stackable/hive-operator:latest
oci.stackable.tech/sdp/hive-operator:0.0.0-dev
----

== PRODUCT_CONFIG
Expand All @@ -56,7 +56,7 @@ docker run \
--env KUBECONFIG=/home/stackable/.kube/config \
--env PRODUCT_CONFIG=/my/product/config.yaml \
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
docker.stackable.tech/stackable/hive-operator:latest
oci.stackable.tech/sdp/hive-operator:0.0.0-dev
----

== WATCH_NAMESPACE
Expand Down Expand Up @@ -85,5 +85,5 @@ docker run \
--env KUBECONFIG=/home/stackable/.kube/config \
--env WATCH_NAMESPACE=test \
--mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
docker.stackable.tech/stackable/hive-operator:latest
oci.stackable.tech/sdp/hive-operator:0.0.0-dev
----
12 changes: 6 additions & 6 deletions docs/modules/hive/pages/usage-guide/database-driver.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
claimName: pvc-hive-drivers
initContainers:
- name: dest-dir
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.3.0
image: oci.stackable.tech/sdp/tools:1.0.0-stackable24.3.0
env:
- name: DEST_DIR
value: "/stackable/externals"
Expand All @@ -71,7 +71,7 @@ spec:
mountPath: /stackable/externals
containers:
- name: hive-driver
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.3.0
image: oci.stackable.tech/sdp/tools:1.0.0-stackable24.3.0
env:
- name: DEST_DIR
value: "/stackable/externals"
Expand Down Expand Up @@ -109,7 +109,7 @@ spec:
claimName: pvc-hive-drivers
containers:
- name: hive-driver
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.3.0
image: oci.stackable.tech/sdp/tools:1.0.0-stackable24.3.0
env:
- name: DEST_DIR
value: "/stackable/externals"
Expand Down Expand Up @@ -195,15 +195,15 @@ If you have access to a registry to store custom images, another approach is to
.Copy the driver
[source]
----
FROM docker.stackable.tech/stackable/hive:4.0.0-stackable0.0.0-dev
FROM oci.stackable.tech/sdp/hive:4.0.0-stackable0.0.0-dev

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
----

.Build and tag the image
[source]
----
docker build -f ./Dockerfile -t docker.stackable.tech/stackable/hive:4.0.0-stackable0.0.0-dev-mysql .
docker build -f ./Dockerfile -t oci.stackable.tech/sdp/hive:4.0.0-stackable0.0.0-dev-mysql .
----

.Reference the new path to the driver without the need for using a volume mounted from a PVC
Expand All @@ -216,7 +216,7 @@ metadata:
name: hive
spec:
image:
custom: docker.stackable.tech/stackable/hive:4.0.0-stackable0.0.0-dev-mysql # <1>
custom: oci.stackable.tech/sdp/hive:4.0.0-stackable0.0.0-dev-mysql # <1>
productVersion: 4.0.0
clusterConfig:
database:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
serviceAccountName: test-sa
initContainers:
- name: init
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
args:
- sh
- -euo
Expand All @@ -36,7 +36,7 @@ spec:
name: data
containers:
- name: kdc
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
args:
- krb5kdc
- -n
Expand All @@ -54,7 +54,7 @@ spec:
runAsUser: 0
{% endif %}
- name: kadmind
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
args:
- kadmind
- -nofork
Expand All @@ -72,7 +72,7 @@ spec:
runAsUser: 0
{% endif %}
- name: client
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
tty: true
stdin: true
env:
Expand Down
2 changes: 1 addition & 1 deletion tests/templates/kuttl/kerberos-hdfs/35-access-hdfs.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ commands:
serviceAccountName: test-sa
containers:
- name: access-hdfs
image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hdfs-latest'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/hadoop:{{ test_scenario['values']['hdfs-latest'] }}-stackable0.0.0-dev
imagePullPolicy: IfNotPresent
env:
- name: HADOOP_CONF_DIR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ commands:
serviceAccountName: test-sa
containers:
- name: access-hive
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
imagePullPolicy: IfNotPresent
env:
- name: KRB5_CONFIG
Expand Down
8 changes: 4 additions & 4 deletions tests/templates/kuttl/kerberos-s3/01-install-krb5-kdc.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
serviceAccountName: test-sa
initContainers:
- name: init
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
args:
- sh
- -euo
Expand All @@ -36,7 +36,7 @@ spec:
name: data
containers:
- name: kdc
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
args:
- krb5kdc
- -n
Expand All @@ -54,7 +54,7 @@ spec:
runAsUser: 0
{% endif %}
- name: kadmind
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
args:
- kadmind
- -nofork
Expand All @@ -72,7 +72,7 @@ spec:
runAsUser: 0
{% endif %}
- name: client
image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
tty: true
stdin: true
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ commands:
serviceAccountName: test-sa
containers:
- name: access-hive
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
imagePullPolicy: IfNotPresent
env:
- name: KRB5_CONFIG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: hive-test-runner
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
stdin: true
tty: true
2 changes: 1 addition & 1 deletion tests/templates/kuttl/smoke/70-install-test-metastore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: test-metastore
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
stdin: true
tty: true
resources:
Expand Down
4 changes: 2 additions & 2 deletions tests/test-definition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ dimensions:
- 4.0.0
# Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
# as in the example below.
# - 4.0.0,docker.stackable.tech/sandbox/hive:4.0.0-stackable0.0.0-dev
# - 4.0.0,oci.stackable.tech/sandbox/hive:4.0.0-stackable0.0.0-dev
- name: hive-latest
values:
- 4.0.0
# Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
# as in the example below.
# - 4.0.0,docker.stackable.tech/sandbox/hive:4.0.0-stackable0.0.0-dev
# - 4.0.0,oci.stackable.tech/sandbox/hive:4.0.0-stackable0.0.0-dev
- name: hive-old
values:
- 3.1.3
Expand Down