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

Fixing for_each for var.swoop_sa_iam_role #54

Merged
merged 4 commits into from
Feb 26, 2024
Merged

Fixing for_each for var.swoop_sa_iam_role #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d77d3a
Fixing for_each for var.swoop_sa_iam_role
hectormachin Feb 26, 2024
4fc3ff0
Fixing for_each for var.swoop_sa_iam_role
hectormachin Feb 26, 2024
017cb5d
Fixing for_each for var.swoop_sa_iam_role
hectormachin Feb 26, 2024
a9c787e
Fixing testkube tests
hectormachin Feb 26, 2024
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: 1 addition & 4 deletions .github/workflows/testkube.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,9 @@ jobs:
kubectl exec -it --namespace=db svc/postgres -- /bin/sh -c "swoop-db up"
kubectl exec -it --namespace=db svc/postgres -- /bin/sh -c "swoop-db load-fixture base_01"

- uses: kubeshop/setup-testkube@v1
- name: Installing Testkube
run: |
wget -qO - https://repo.testkube.io/key.pub | sudo apt-key add -
echo "deb https://repo.testkube.io/linux linux main" | sudo tee -a /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -y testkube
kubectl testkube install --no-confirm
kubectl wait --for=condition=ready --timeout=30m pod -n testkube -l app.kubernetes.io/instance=testkube
kubectl port-forward -n testkube svc/testkube-api-server 8088:8088 &
Expand Down
4 changes: 2 additions & 2 deletions modules/swoop/swoop-bundle/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ resource "helm_release" "swoop_bundle" {
}

dynamic "set" {
for_each = var.swoop_sa_iam_role != "" ? [var.swoop_sa_iam_role] : []
for_each = nonsensitive(var.swoop_sa_iam_role) != "" ? [nonsensitive(var.swoop_sa_iam_role)] : []
content {
name = "swoop-caboose.argo-workflows.workflow.serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
value = set.value
Expand Down Expand Up @@ -231,7 +231,7 @@ resource "helm_release" "swoop_bundle" {
}

dynamic "set" {
for_each = var.swoop_sa_iam_role != "" ? [var.swoop_sa_iam_role] : []
for_each = nonsensitive(var.swoop_sa_iam_role) != "" ? [nonsensitive(var.swoop_sa_iam_role)] : []
content {
name = "swoop-conductor.argo-workflows.workflow.serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
value = set.value
Expand Down
Loading