diff --git a/cicd/backstage-templates/entities/ci-cd/provisioner/workflow.yaml b/cicd/backstage-templates/entities/ci-cd/provisioner/workflow.yaml index a5cfbce..1b08ec6 100644 --- a/cicd/backstage-templates/entities/ci-cd/provisioner/workflow.yaml +++ b/cicd/backstage-templates/entities/ci-cd/provisioner/workflow.yaml @@ -467,6 +467,7 @@ spec: deploy_repo={{inputs.parameters.deploy-repo}} && service_name={{inputs.parameters.service-name}} && echo "serviceName: $service_name" > cd-test.yaml && + echo "k8sServer: workshop-cluster" >> cd-test.yaml && echo "envList: " >> cd-test.yaml && for env in $(yq -r '.envs[].name' /workdir/$service_name-deploy/provisioner.yaml); do echo "*** Creating ${env} Argo CD App ***" diff --git a/cicd/backstage-templates/entities/ci-cd/template.yaml b/cicd/backstage-templates/entities/ci-cd/template.yaml index 7fe9d29..ed05bfb 100644 --- a/cicd/backstage-templates/entities/ci-cd/template.yaml +++ b/cicd/backstage-templates/entities/ci-cd/template.yaml @@ -79,7 +79,7 @@ spec: enum: - gitea artifactoryCredentialPath: - title: Artifact Store Credentials Path + title: Artifactory Store Credentials Path type: string default: /team1/artifactory githubCrdes: @@ -117,9 +117,9 @@ spec: clusterName: title: Cluster Name type: string - default: remote-eks + default: workshop-cluster enum: - - 'remote-eks' + - 'workshop-cluster' steps: - id: deploy-template diff --git a/cicd/shared-helm-charts/entities/argocd-apps/values.yaml b/cicd/shared-helm-charts/entities/argocd-apps/values.yaml index ec4e63b..405d7c1 100644 --- a/cicd/shared-helm-charts/entities/argocd-apps/values.yaml +++ b/cicd/shared-helm-charts/entities/argocd-apps/values.yaml @@ -1,6 +1,7 @@ serviceName: demo-app01 project: default namespace: argocd + k8sServer: https://kubernetes.default.svc # envList: