diff --git a/.github/test-data/quarkus-app-3.11-db.json b/.github/test-data/quarkus-app-3.11-db.json index bea7384..64af568 100644 --- a/.github/test-data/quarkus-app-3.11-db.json +++ b/.github/test-data/quarkus-app-3.11-db.json @@ -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": {} } \ No newline at end of file diff --git a/.github/workflows/e2e-backstage.yml b/.github/workflows/e2e-backstage.yml index aa3a632..6463d54 100644 --- a/.github/workflows/e2e-backstage.yml +++ b/.github/workflows/e2e-backstage.yml @@ -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 @@ -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: @@ -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: | @@ -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 diff --git a/catalog-info.yaml b/catalog-info.yaml index da45ed3..94beeb8 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -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: diff --git a/locations/templates/quarkus-application/template.yaml b/locations/templates/quarkus-application/template.yaml index ae62d34..51ed144 100644 --- a/locations/templates/quarkus-application/template.yaml +++ b/locations/templates/quarkus-application/template.yaml @@ -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 }} diff --git a/manifest/idp/packages/argocd/cm.yaml b/manifest/idp/packages/argocd/cm.yaml index 49f5e60..701aa4d 100644 --- a/manifest/idp/packages/argocd/cm.yaml +++ b/manifest/idp/packages/argocd/cm.yaml @@ -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