Skip to content

Commit

Permalink
Merge branch 'w/2.7/improvement/ZENKO-4852' into w/2.8/improvement/ZE…
Browse files Browse the repository at this point in the history
  • Loading branch information
francoisferrand committed Jul 10, 2024
2 parents fdd88a0 + 2faa789 commit 3669110
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions solution/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ OPERATOR_SDK_OPTS=
SKOPEO=skopeo
SKOPEO_OPTS="--override-os linux --insecure-policy"

KAF_VERSION=v0.2.2
STERN_VERSION=1.21.0
FZF_VERSION=0.30.0
FUBECTL_VERSION=ed5f8a8e9feb650ca20100cc094e0f0ce1fd3898
KAF_VERSION=v0.2.8
STERN_VERSION=1.30.0
FZF_VERSION=0.54.0
FUBECTL_VERSION=6abf81a4d275d49351127458d4dd8f6468f0366a

export SOLUTION_REGISTRY=metalk8s-registry-from-config.invalid/${PRODUCT_LOWERNAME}-${VERSION_FULL}

Expand Down Expand Up @@ -318,7 +318,7 @@ function download_tools()
# fuzzy finder for fubectl
(
cd ${BUILD_ROOT} &&
curl -LO https://github.com/junegunn/fzf/releases/download/${FZF_VERSION}/fzf-${FZF_VERSION}-linux_amd64.tar.gz &&
curl -LO https://github.com/junegunn/fzf/releases/download/v${FZF_VERSION}/fzf-${FZF_VERSION}-linux_amd64.tar.gz &&
tar zvxf fzf-${FZF_VERSION}-linux_amd64.tar.gz -C ${ISO_BINDIR} fzf
)

Expand Down
10 changes: 5 additions & 5 deletions solution/deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kafka-cleaner:
sourceRegistry: ghcr.io/scality
dashboard: kafka-cleaner/kafka-cleaner-dashboards
image: kafka-cleaner
tag: v1.0.2
tag: v1.0.3
envsubst: KAFKA_CLEANER_TAG
kafka-connect:
sourceRegistry: ghcr.io/scality/zenko
Expand All @@ -55,7 +55,7 @@ kafka-lag-exporter:
pensieve-api:
sourceRegistry: ghcr.io/scality
image: pensieve-api
tag: 1.4.10
tag: 1.4.11
envsubst: PENSIEVE_API_TAG
rclone:
sourceRegistry: rclone
Expand All @@ -75,7 +75,7 @@ s3utils:
sourceRegistry: ghcr.io/scality
dashboard: s3utils/s3utils-dashboards
image: s3utils
tag: 1.14.10
tag: 1.14.12
envsubst: S3UTILS_TAG
scuba:
sourceRegistry: ghcr.io/scality
Expand All @@ -88,7 +88,7 @@ sorbet:
policy: sorbet/sorbet-policies
dashboard: sorbet/sorbet-dashboards
image: sorbet
tag: v1.1.9
tag: v1.1.10
envsubst: SORBET_TAG
# To be enabled back when utapi is used in Zenko 2.x
# utapi:
Expand All @@ -106,7 +106,7 @@ vault:
zenko-operator:
sourceRegistry: ghcr.io/scality
image: zenko-operator
tag: 1.5.49
tag: 1.5.50
envsubst: ZENKO_OPERATOR_TAG
zenko-ui:
sourceRegistry: ghcr.io/scality
Expand Down
2 changes: 1 addition & 1 deletion tests/ctst/features/cloudserverAuth.feature
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ Feature: AWS S3 Bucket operations
Examples:
| bucketName | objName1 | objName2 | resource1 | resource2 | allow | should |
| ca-do-bucket-1 | obj1 | obj2 | ca-do-bucket-1/obj1 | ca-do-bucket-1/obj2 | Allow | should |
| ca-do-bucket-2 | obj1 | obj2 | ca-do-bucket-1/obj1 | ca-do-bucket-1/obj2 | Deny | should not |
| ca-do-bucket-2 | obj1 | obj2 | ca-do-bucket-2/obj1 | ca-do-bucket-2/obj2 | Deny | should not |

0 comments on commit 3669110

Please sign in to comment.