Skip to content

Commit e302ca0

Browse files
rhiannonlynnerhiannonlynne
committed
List defaults explicitly
1 parent beb1287 commit e302ca0

File tree

5 files changed

+172
-6
lines changed

5 files changed

+172
-6
lines changed

‎.github/workflows/build_docs.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
auto-update-conda: true
2121
python-version: "3.12"
2222
miniforge-version: latest
23-
channels: conda-forge
24-
conda-remove-defaults: true
23+
channels: conda-forge,defaults
2524
show-channel-urls: true
2625

2726
- name: configure conda and install requirements

‎.github/workflows/cache.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ jobs:
1717
auto-update-conda: true
1818
python-version: "3.12"
1919
miniforge-version: latest
20-
channels: conda-forge
21-
conda-remove-defaults: true
20+
channels: conda-forge,defaults
2221
show-channel-urls: true
2322

2423
- name: Configure conda and install minimal requirements for cache

‎.github/workflows/test_and_build.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ jobs:
2929
auto-update-conda: true
3030
python-version: ${{ matrix.python-version }}
3131
miniforge-version: latest
32-
channels: conda-forge
33-
conda-remove-defaults: true
32+
channels: conda-forge,defaults
3433
show-channel-urls: true
3534

3635
- name: configure conda and install requirements

‎example_deployment.yaml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
---
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: maf
6+
7+
---
8+
apiVersion: apps/v1
9+
kind: Deployment
10+
metadata:
11+
namespace: maf
12+
name: maf-server
13+
labels:
14+
app: maf-server
15+
spec:
16+
replicas: 1
17+
selector:
18+
matchLabels: app maf-server
19+
template:
20+
metadata:
21+
labels:
22+
app: maf-server
23+
spec:
24+
containers:
25+
- name: maf
26+
image: "ghcr.io/....:tag"
27+
imagePullPolicy: Always
28+
resources:
29+
limits:
30+
cpu: 1
31+
memory: "2Gi"
32+
requests:
33+
cpu: 500m
34+
memory: "1Gi"
35+
volumeMounts:
36+
- mountPath: /sdf/data/rubin
37+
name: sdf-data-rubin
38+
volumes:
39+
- name: sdf-data-rubin
40+
persistentVolumeClaim:
41+
claimName: sdf-data-rubin
42+
---
43+
apiVersion: v1
44+
kind: PersistentVolumeClaim
45+
metadata:
46+
namespace: maf
47+
name: sdf-data-rubin
48+
spec:
49+
storageClassName: sdf-data-rubin
50+
accessModes:
51+
- ReadOnlyMany
52+
resources:
53+
requests:
54+
storage: 1Gi
55+
---
56+
apiVersion: v1
57+
kind: Service
58+
metadata:
59+
namespace: maf
60+
name: usdf-maf
61+
labels:
62+
app: maf-server
63+
annotations:
64+
metallb.universe.tf/address-pool: sdf-services
65+
spec:
66+
type: LoadBalancer
67+
ports:
68+
- name: http
69+
port: 80
70+
protocol: TCP
71+
targetPort: 80
72+
selector:
73+
app: maf-server

‎showmaf-deploy.yaml

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
---
2+
apiVersion: v1
3+
kind: Namespace
4+
metadata:
5+
name: maf
6+
7+
---
8+
apiVersion: apps/v1
9+
kind: Deployment
10+
metadata:
11+
namespace: maf
12+
name: maf-server
13+
labels:
14+
app: maf-server
15+
spec:
16+
replicas: 1
17+
selector:
18+
matchLabels:
19+
app: maf-server
20+
template:
21+
metadata:
22+
labels:
23+
app: maf-server
24+
spec:
25+
containers:
26+
- name: maf
27+
image: "ghcr.io/lsst/rubin_sim:main"
28+
imagePullPolicy: Always
29+
resources:
30+
limits:
31+
cpu: 1
32+
memory: "10Gi"
33+
requests:
34+
cpu: 500m
35+
memory: "8Gi"
36+
volumeMounts:
37+
- mountPath: /data/fbs_sims
38+
name: sdf-data-rubin
39+
subPath: shared/fbs_sims
40+
volumes:
41+
- name: sdf-data-rubin
42+
persistentVolumeClaim:
43+
claimName: sdf-data-rubin
44+
---
45+
apiVersion: v1
46+
kind: PersistentVolumeClaim
47+
metadata:
48+
namespace: maf
49+
name: sdf-data-rubin
50+
spec:
51+
storageClassName: sdf-data-rubin
52+
accessModes:
53+
- ReadOnlyMany
54+
resources:
55+
requests:
56+
storage: 8Gi
57+
---
58+
apiVersion: v1
59+
kind: Service
60+
metadata:
61+
namespace: maf
62+
name: usdf-maf
63+
labels:
64+
app: maf-server
65+
annotations:
66+
metallb.universe.tf/address-pool: sdf-services
67+
spec:
68+
type: LoadBalancer
69+
ports:
70+
- name: http
71+
port: 80
72+
protocol: TCP
73+
targetPort: 8080
74+
selector:
75+
app: maf-server
76+
---
77+
apiVersion: networking.k8s.io/v1
78+
kind: Ingress
79+
metadata:
80+
name: maf-ingress
81+
namespace: maf
82+
labels:
83+
app: maf-server
84+
spec:
85+
ingressClassName: nginx
86+
rules:
87+
- host: usdf-maf.slac.stanford.edu
88+
http:
89+
paths:
90+
- backend:
91+
service:
92+
name: usdf-maf
93+
port:
94+
number: 80
95+
path: /
96+
pathType: Prefix

0 commit comments

Comments
 (0)