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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jan 30, 2025
Merged

chore: add oci references, merge templating changes #676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5022216
replace nexus references with harbor
adwk67 Jan 17, 2025
de834fd
corrected oci folder name
adwk67 Jan 17, 2025
bc2ce44
Merge branch 'main' into chore/harbor-migration
xeniape Jan 28, 2025
8e87126
Merge branch 'main' into chore/harbor-migration
adwk67 Jan 29, 2025
0fc828e
bump op-rs to 0-85
adwk67 Jan 29, 2025
a5f47a1
changelog
adwk67 Jan 29, 2025
da28bfd
reverted test defs
adwk67 Jan 29, 2025
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
Next Next commit
replace nexus references with harbor
  • Loading branch information
@adwk67
adwk67 committed Jan 17, 2025
commit 502221609b582d87eb0290b7ecaed0ed9a0dd280
2 changes: 1 addition & 1 deletion deploy/helm/druid-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Default values for druid-operator.
---
image:
repository: docker.stackable.tech/stackable/druid-operator
repository: oci.stackable.tech/stackable/druid-operator
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down
6 changes: 3 additions & 3 deletions docs/modules/druid/pages/reference/environment-variables.adoc
View file
Open in desktop
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/druid-operator:latest
oci.stackable.tech/sdp/druid-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/druid-operator:latest
oci.stackable.tech/sdp/druid-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/druid-operator:latest
oci.stackable.tech/sdp/druid-operator:0.0.0-dev
----
2 changes: 1 addition & 1 deletion tests/templates/kuttl/authorizer/05-checks-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: checks
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
command: ["sleep", "infinity"]
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/hdfs-deep-storage/04-checks-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: checks
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
command: ["sleep", "infinity"]
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/ingestion-no-s3-ext/04-checks-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: checks
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
command: ["sleep", "infinity"]
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/ingestion-s3-ext/04-checks-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: checks
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
command: ["sleep", "infinity"]
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/ldap/03-install-test-druid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: test-druid
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
command: ["sleep", "infinity"]
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/logging/06-install-druid-test-runner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: druid-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
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/oidc/51-install-test-container.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
fsGroup: 1000
containers:
- name: python
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
2 changes: 1 addition & 1 deletion tests/templates/kuttl/s3-deep-storage/07-checks-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: checks
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
command: ["sleep", "infinity"]
terminationGracePeriodSeconds: 1
2 changes: 1 addition & 1 deletion tests/templates/kuttl/smoke/60-checks-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: checks
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
command: ["sleep", "infinity"]
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion tests/templates/kuttl/tls/05-install-checks.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
runAsUser: 0
containers:
- name: druid-checks
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
command: ["sleep", "infinity"]
env:
- name: DRUID_OIDC
Expand Down
10 changes: 5 additions & 5 deletions tests/test-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
dimensions:
- name: druid
values:
- 26.0.0
- 30.0.0
- 26.0.0,oci.stackable.tech/sdp/druid:26.0.0-stackable0.0.0-dev
- 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev
# To use a custom image, add a comma and the full name after the product version
# - 28.0.1,docker.stackable.tech/sandbox/druid:28.0.1-stackable0.0.0-dev
# - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev
- name: druid-latest
values:
- 30.0.0
- 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev
# To use a custom image, add a comma and the full name after the product version
# - 28.0.1,docker.stackable.tech/sandbox/druid:28.0.1-stackable0.0.0-dev
# - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev
- name: zookeeper
values:
- 3.9.2
Expand Down
Loading