Skip to content

Commit a55cdee

Browse files
committed
switch to using uvx for ec tool
1 parent cd8b44a commit a55cdee

File tree

10 files changed

+56
-225
lines changed

10 files changed

+56
-225
lines changed

src/deploy_tools/demo_configuration/dls-pmac-control/0.1.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/deploy_tools/demo_configuration/dls-pmac-control/0.2.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/deploy_tools/demo_configuration/ec/no-beamline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ module:
88

99
dependencies:
1010
- name: edge-containers-cli
11-
version: no-beamline
11+
version: 4.4.5
1212

1313
applications: []
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# yaml-language-server: $schema=/workspaces/deploy-tools/src/deploy_tools/models/schemas/release.json
2+
3+
module:
4+
name: ec
5+
version: personal
6+
description: ec command line tool configured for personal namespace
7+
allow_updates: true
8+
9+
dependencies:
10+
- name: edge-containers-cli
11+
- name: argus
12+
version: local
13+
14+
env_vars:
15+
- name: EC_TARGET
16+
value: $::env(EC_TARGET)
17+
- name: EC_K8S_NAMESPACE
18+
value: $::env(USER)
19+
- name: EC_SERVICES_REPO
20+
value: $::env(EC_SERVICES_REPO)
21+
22+
applications: []

src/deploy_tools/demo_configuration/edge-containers-cli/0.1.yaml

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# yaml-language-server: $schema=/workspaces/deploy-tools/src/deploy_tools/models/schemas/release.json
2+
3+
module:
4+
name: edge-containers-cli
5+
version: "4.4.5"
6+
description: ec command line tool for kubernetes IOCs
7+
allow_updates: true
8+
9+
dependencies:
10+
- name: argocd
11+
version: v2.14.10
12+
- name: uv
13+
version: "0.8.13"
14+
15+
env_vars:
16+
- name: EC_CLI_BACKEND
17+
value: ARGOCD
18+
- name: EC_LOG_URL
19+
value: "https://graylog.diamond.ac.uk/search?rangetype=relative&fields=message%2Csource&width=1489&highlightMessage=&relative=172800&q=pod_name%3A{service_name}*"
20+
- name: EC_LOGIN_URL
21+
value: argocd login argocd.diamond.ac.uk --grpc-web --sso
22+
23+
applications:
24+
- app_type: shell
25+
name: ec
26+
script:
27+
- uvx -q --upgrade --from edge-containers-cli==5.0.0-alpha.1 ec "${@}"
28+
29+
- app_type: shell
30+
name: ec-login
31+
script:
32+
- argocd login argocd.diamond.ac.uk --grpc-web --sso
33+
- kubectl version

src/deploy_tools/demo_configuration/edge-containers-cli/no-beamline.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/deploy_tools/demo_configuration/example-module-apps/0.1.yaml

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/deploy_tools/demo_configuration/example-module-deps/0.2.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# yaml-language-server: $schema=/workspaces/deploy-tools/src/deploy_tools/models/schemas/deployment-settings.json
22

33
default_versions:
4-
dls-pmac-control: "0.1"
54
ec: no-beamline

0 commit comments

Comments
 (0)