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

Replace dummy with demo as namespace #166

Merged
merged 2 commits into from
Jun 26, 2024
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
4 changes: 2 additions & 2 deletions .github/test-data/quarkus-app-3.11-db.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"org": "q-shift",
"visibility": "public"
},
"namespace": "dummy",
"namespace": "demo",
"imageRepository": "quay.io",
"imageUrl": "quay.io/qshift/my-quarkus-app-job",
"virtualMachineName": "quarkus-dev",
"virtualMachineNamespace": "dummy"
"virtualMachineNamespace": "demo"
},
"secrets": {}
}
17 changes: 9 additions & 8 deletions .github/workflows/e2e-backstage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ on:
branches:
- main
pull_request:
pull_request_target:
branches: [ 'main' ]
# types: [opened, edited]
# TODO: To be reviewed to figure out if we need it or not
#pull_request_target:
# branches: [ 'main' ]
# # types: [opened, edited]

permissions:
contents: write
Expand Down Expand Up @@ -36,8 +37,8 @@ env:
QUAY_ORG: qshift

# This namespace will be used to build/deploy the generated quarkus app and
# should be the same as the one defined within the ConfigMap of ArgocCD using: application.namespaces: "dummy"
KUBE_NAMESPACE: dummy
# should be the same as the one defined within the ConfigMap of ArgocCD using: application.namespaces: "demo"
KUBE_NAMESPACE: demo

jobs:
setup-idp:
Expand Down Expand Up @@ -214,7 +215,7 @@ jobs:
# }
# }
# EOF
# kubectl create secret generic dockerconfig-secret -n dummy --from-file=config.json
# kubectl create secret generic dockerconfig-secret -n demo --from-file=config.json

#- name: Create the gitea organization
# run: |
Expand Down Expand Up @@ -242,9 +243,9 @@ jobs:
}
}
EOF
kubectl create secret generic dockerconfig-secret -n dummy --from-file=config.json
kubectl create secret generic dockerconfig-secret -n demo --from-file=config.json

- name: Rollout ArgoCD as we created a dummy namespace where Applications will be deployed
- name: Rollout ArgoCD as we created a demo namespace where Applications will be deployed
run: |
echo "Rollout Argocd to take into consideration the new namespace created ..."
kubectl rollout restart -n argocd deployment argocd-server
Expand Down
2 changes: 1 addition & 1 deletion catalog-info.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: backstage.io/v1alpha1
kind: Component
metadata:
name: dummy1
name: demo1
description: An example of a Backstage application.
# Example for optional annotations
# annotations:
Expand Down
2 changes: 1 addition & 1 deletion locations/templates/quarkus-application/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ spec:
action: publish:gitea
if: ${{ parameters.repo.host !== "github.com" }}
input:
name: This is a dummy project
name: This is a demo project
description: This is ${{ parameters.component_id }}
repoUrl: ${{ parameters.repo.host }}?owner=${{ parameters.repo.org }}&repo=${{ parameters.component_id }}
repoVisibility: ${{ parameters.repo.visibility }}
Expand Down
2 changes: 1 addition & 1 deletion manifest/idp/packages/argocd/cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/name: argocd-cmd-params-cm
app.kubernetes.io/part-of: argocd
data:
application.namespaces: "dummy"
application.namespaces: "demo"
---
apiVersion: v1
kind: ConfigMap
Expand Down
Loading