Skip to content

Commit 5bb3415

Browse files
adwk67xeniape
andauthored
chore: Replace nexus references with oci (#945)
* chore: replace nexus references with oci * changelog --------- Co-authored-by: Xenia <xeniafischer@hotmail.de>
1 parent b8fe43f commit 5bb3415

File tree

7 files changed

+23
-17
lines changed

7 files changed

+23
-17
lines changed

crates/stackable-operator/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Changed
8+
9+
- Change constant used for product image selection so that it defaults to OCI ([#945]).
10+
11+
[#945]: https://github.com/stackabletech/operator-rs/pull/945
12+
713
## [0.84.1] - 2025-01-22
814

915
### Fixed

crates/stackable-operator/fixtures/helm/input-additional.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Partly taken from https://github.com/stackabletech/zookeeper-operator/blob/main/deploy/helm/zookeeper-operator/values.yaml
22
---
33
image:
4-
repository: docker.stackable.tech/stackable/zookeeper-operator
4+
repository: oci.stackable.tech/sdp/zookeeper-operator
55
pullPolicy: IfNotPresent
66
pullSecrets: []
77
nameOverride: ''

crates/stackable-operator/fixtures/helm/input-required.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Partly taken from https://github.com/stackabletech/zookeeper-operator/blob/main/deploy/helm/zookeeper-operator/values.yaml
22
---
33
image:
4-
repository: docker.stackable.tech/stackable/zookeeper-operator
4+
repository: oci.stackable.tech/sdp/zookeeper-operator
55
pullPolicy: IfNotPresent
66
pullSecrets: []
77
nameOverride: ''

crates/stackable-operator/fixtures/helm/output.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
image:
3-
repository: docker.stackable.tech/stackable/zookeeper-operator
3+
repository: oci.stackable.tech/sdp/zookeeper-operator
44
pullPolicy: IfNotPresent
55
pullSecrets: []
66
nameOverride: ''

crates/stackable-operator/src/commons/product_image_selection.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use strum::AsRefStr;
77
#[cfg(doc)]
88
use crate::kvp::Labels;
99

10-
pub const STACKABLE_DOCKER_REPO: &str = "docker.stackable.tech/stackable";
10+
pub const STACKABLE_DOCKER_REPO: &str = "oci.stackable.tech/sdp";
1111

1212
/// Specify which image to use, the easiest way is to only configure the `productVersion`.
1313
/// You can also configure a custom image registry to pull from, as well as completely custom
@@ -43,7 +43,7 @@ pub enum ProductImageSelection {
4343
#[serde(rename_all = "camelCase")]
4444
pub struct ProductImageCustom {
4545
/// Overwrite the docker image.
46-
/// Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
46+
/// Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
4747
custom: String,
4848
/// Version of the product, e.g. `1.4.1`.
4949
product_version: String,
@@ -58,7 +58,7 @@ pub struct ProductImageStackableVersion {
5858
/// If not specified, the operator will use its own version, e.g. `23.4.1`.
5959
/// When using a nightly operator or a pr version, it will use the nightly `0.0.0-dev` image.
6060
stackable_version: Option<String>,
61-
/// Name of the docker repo, e.g. `docker.stackable.tech/stackable`
61+
/// Name of the docker repo, e.g. `oci.stackable.tech/sdp`
6262
repo: Option<String>,
6363
}
6464

@@ -70,7 +70,7 @@ pub struct ResolvedProductImage {
7070
/// App version as formatted for [`Labels::recommended`]
7171
pub app_version_label: String,
7272

73-
/// Image to be used for the product image e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
73+
/// Image to be used for the product image e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
7474
pub image: String,
7575

7676
/// Image pull policy for the containers using the product image
@@ -190,7 +190,7 @@ mod tests {
190190
productVersion: 1.4.1
191191
"#,
192192
ResolvedProductImage {
193-
image: "docker.stackable.tech/stackable/superset:1.4.1-stackable23.7.42".to_string(),
193+
image: "oci.stackable.tech/sdp/superset:1.4.1-stackable23.7.42".to_string(),
194194
app_version_label: "1.4.1-stackable23.7.42".to_string(),
195195
product_version: "1.4.1".to_string(),
196196
image_pull_policy: "Always".to_string(),
@@ -204,7 +204,7 @@ mod tests {
204204
productVersion: 1.4.1
205205
"#,
206206
ResolvedProductImage {
207-
image: "docker.stackable.tech/stackable/superset:1.4.1-stackable0.0.0-dev".to_string(),
207+
image: "oci.stackable.tech/sdp/superset:1.4.1-stackable0.0.0-dev".to_string(),
208208
app_version_label: "1.4.1-stackable0.0.0-dev".to_string(),
209209
product_version: "1.4.1".to_string(),
210210
image_pull_policy: "Always".to_string(),
@@ -218,7 +218,7 @@ mod tests {
218218
productVersion: 1.4.1
219219
"#,
220220
ResolvedProductImage {
221-
image: "docker.stackable.tech/stackable/superset:1.4.1-stackable0.0.0-dev".to_string(),
221+
image: "oci.stackable.tech/sdp/superset:1.4.1-stackable0.0.0-dev".to_string(),
222222
app_version_label: "1.4.1-stackable0.0.0-dev".to_string(),
223223
product_version: "1.4.1".to_string(),
224224
image_pull_policy: "Always".to_string(),
@@ -233,7 +233,7 @@ mod tests {
233233
stackableVersion: 2.1.0
234234
"#,
235235
ResolvedProductImage {
236-
image: "docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0".to_string(),
236+
image: "oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0".to_string(),
237237
app_version_label: "1.4.1-stackable2.1.0".to_string(),
238238
product_version: "1.4.1".to_string(),
239239
image_pull_policy: "Always".to_string(),
@@ -320,11 +320,11 @@ mod tests {
320320
"superset",
321321
"23.7.42",
322322
r#"
323-
custom: docker.stackable.tech/stackable/superset@sha256:85fa483aa99b9997ce476b86893ad5ed81fb7fd2db602977eb8c42f76efc1098
323+
custom: oci.stackable.tech/sdp/superset@sha256:85fa483aa99b9997ce476b86893ad5ed81fb7fd2db602977eb8c42f76efc1098
324324
productVersion: 1.4.1
325325
"#,
326326
ResolvedProductImage {
327-
image: "docker.stackable.tech/stackable/superset@sha256:85fa483aa99b9997ce476b86893ad5ed81fb7fd2db602977eb8c42f76efc1098".to_string(),
327+
image: "oci.stackable.tech/sdp/superset@sha256:85fa483aa99b9997ce476b86893ad5ed81fb7fd2db602977eb8c42f76efc1098".to_string(),
328328
app_version_label: "1.4.1-sha256:85fa483aa99b9997ce476b86893ad5ed81fb7fd2db602977eb".to_string(),
329329
product_version: "1.4.1".to_string(),
330330
image_pull_policy: "Always".to_string(),

crates/stackable-operator/src/product_logging/framework.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ sinks:
13831383
/// # let resolved_product_image = ResolvedProductImage {
13841384
/// # product_version: "1.0.0".into(),
13851385
/// # app_version_label: "1.0.0".into(),
1386-
/// # image: "docker.stackable.tech/stackable/my-product:1.0.0-stackable1.0.0".into(),
1386+
/// # image: "oci.stackable.tech/sdp/my-product:1.0.0-stackable1.0.0".into(),
13871387
/// # image_pull_policy: "Always".into(),
13881388
/// # pull_secrets: None,
13891389
/// # };
@@ -1503,7 +1503,7 @@ kill $vector_pid
15031503
///
15041504
/// let container = ContainerBuilder::new("init")
15051505
/// .unwrap()
1506-
/// .image("docker.stackable.tech/stackable/my-product:1.0.0-stackable1.0.0")
1506+
/// .image("oci.stackable.tech/sdp/my-product:1.0.0-stackable1.0.0")
15071507
/// .command(vec!["bash".to_string(), "-c".to_string()])
15081508
/// .args(vec![args.join(" && ")])
15091509
/// .add_volume_mount("log", STACKABLE_LOG_DIR)

crates/stackable-operator/src/utils/crds.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ mod tests {
9393
spec:
9494
containers:
9595
- name: nifi
96-
image: docker.stackable.tech/stackable/nifi:1.23.2-stackable23.11.0
96+
image: oci.stackable.tech/sdp/nifi:1.23.2-stackable23.11.0
9797
volumeMounts:
9898
- name: jar
9999
mountPath: /stackable/nifi/lib/wifi.png
@@ -116,7 +116,7 @@ mod tests {
116116
podOverrides:
117117
spec:
118118
containers:
119-
- image: docker.stackable.tech/stackable/nifi:1.23.2-stackable23.11.0
119+
- image: oci.stackable.tech/sdp/nifi:1.23.2-stackable23.11.0
120120
"#;
121121

122122
// FIXME: Ideally we would require the names of the containers to be set. We had users using podOverrides

0 commit comments

Comments
 (0)