Skip to content

Commit b0f27ab

Browse files
residue changes for remove gitea (#1367)
1 parent 508f3ed commit b0f27ab

6 files changed

Lines changed: 2 additions & 10 deletions

File tree

.github/actions/deploy_kind/action.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ runs:
6767
DOCKERHUB_TOKEN: ${{ inputs.docker_password }}
6868
DOCKERHUB_USERNAME: ${{ inputs.docker_username }}
6969
DEPLOYMENT_TYPE: ${{ inputs.deployment_type }}
70+
DEPLOY_REPO_BRANCH: ${{ github.sha }}
7071
shell: bash
7172
run: |
7273
set +x

.github/actions/deploy_on_prem/action.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ runs:
5757
TF_VAR_docker_username: ${{ inputs.docker_username }}
5858
TF_VAR_docker_password: ${{ inputs.docker_password }}
5959
KUBECONFIG: ${{ github.workspace }}/terraform/orchestrator/files/kubeconfig
60+
TF_VAR_deploy_repo_branch: ${{ github.sha }}
6061
shell: bash
6162
run: mage deploy:onPrem
6263

on-prem-installers/onprem/cluster_onprem.tpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ argo:
3838
clusterDomain: ${CLUSTER_DOMAIN}
3939

4040
## Argo CD configs
41-
utilsRepoURL: "https://github.com/open-edge-platform/orch-utils"
42-
utilsRepoRevision: ${UTILS_REPO_BRANCH}
4341
deployRepoURL: "https://github.com/open-edge-platform/edge-manageability-framework"
4442
deployRepoRevision: ${DEPLOY_REPO_BRANCH}
4543

on-prem-installers/onprem/onprem.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export DEPLOY_VERSION=v2026.0.0
2121
export ORCH_INSTALLER_PROFILE=onprem
2222

2323
# Git Repositories Configuration
24-
export UTILS_REPO_BRANCH="main"
2524
export DEPLOY_REPO_BRANCH="main"
2625

2726
# =============================================================================

terraform/orchestrator/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ resource "null_resource" "copy_files" {
304304
"bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env OXM_PXE_SERVER_INT ${var.oxm_pxe_server_int}'",
305305
"bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env OXM_PXE_SERVER_IP ${var.oxm_pxe_server_ip}'",
306306
"bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env OXM_PXE_SERVER_SUBNET ${var.oxm_pxe_server_subnet}'",
307-
"bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env UTILS_REPO_BRANCH ${var.utils_repo_branch}'",
308307
"bash -c 'source /home/ubuntu/functions.sh; update_config_variable /home/ubuntu/onprem.env DEPLOY_REPO_BRANCH ${var.deploy_repo_branch}'",
309308
"cat /home/ubuntu/onprem.env",
310309
"echo 'onprem.env updated successfully'"

terraform/orchestrator/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,6 @@ variable "git_proxy" {
326326
default = ""
327327
}
328328

329-
variable "utils_repo_branch" {
330-
type = string
331-
description = "The branch of the utils repository to use."
332-
default = "main"
333-
}
334-
335329
variable "deploy_repo_branch" {
336330
type = string
337331
description = "The branch of the deploy repository to use."

0 commit comments

Comments
 (0)