Skip to content

Commit 2907e85

Browse files
LEDfanLEDfan
committed
Cleanup
1 parent 1636dfa commit 2907e85

2 files changed

Lines changed: 7 additions & 228 deletions

File tree

‎src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnSwarm.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,14 @@ public class TestIntegrationOnSwarm {
6161

6262
private boolean checkEverythingCleanedUp() throws DockerCertificateException, DockerException, InterruptedException {
6363
// Docker
64-
DefaultDockerClient dockerClient = DefaultDockerClient.fromEnv().build();
64+
try (DefaultDockerClient dockerClient = DefaultDockerClient.fromEnv().build()) {
6565

66-
// Docker swarm
67-
return dockerClient.listContainers().stream()
68-
.filter(it -> !(it.labels() != null && it.labels().containsKey("created_by.minikube.sigs.k8s.io") && it.labels().get("created_by.minikube.sigs.k8s.io").equals("true")))
69-
.count() == 0
70-
&& dockerClient.listServices().size() == 0;
66+
// Docker swarm
67+
return dockerClient.listContainers().stream()
68+
.filter(it -> !(it.labels() != null && it.labels().containsKey("created_by.minikube.sigs.k8s.io") && it.labels().get("created_by.minikube.sigs.k8s.io").equals("true")))
69+
.count() == 0
70+
&& dockerClient.listServices().size() == 0;
71+
}
7172
}
7273

7374
@AfterEach

‎src/test/resources/application-test-swarm.yml‎

Lines changed: 0 additions & 222 deletions
Original file line numberDiff line numberDiff line change
@@ -39,225 +39,3 @@ proxy:
3939
gid: 1000
4040
uid: 1000
4141
mode: 600
42-
# - id: 01_hello_volume
43-
# container-specs:
44-
# - image: "openanalytics/shinyproxy-demo"
45-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
46-
# port-mapping:
47-
# default: 3838
48-
# volumes:
49-
# - "/srv/myvolume1:/srv/myvolume1"
50-
# - "/srv/myvolume2:/srv/myvolume2"
51-
# - id: 01_hello_env
52-
# container-specs:
53-
# - image: "openanalytics/shinyproxy-demo"
54-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
55-
# port-mapping:
56-
# default: 3838
57-
# env:
58-
# VAR1:
59-
# VAR2: VALUE2
60-
# VAR3: VALUE3
61-
# - id: 01_hello_secret
62-
# container-specs:
63-
# - image: "openanalytics/shinyproxy-demo"
64-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
65-
# port-mapping:
66-
# default: 3838
67-
# env:
68-
# MY_SECRET: secretKeyRef:mysecret:username
69-
# - id: 01_hello_limits
70-
# container-specs:
71-
# - image: "openanalytics/shinyproxy-demo"
72-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
73-
# port-mapping:
74-
# default: 3838
75-
# cpu-request: 1
76-
# cpu-limit: 2
77-
# memory-request: "1Gi"
78-
# memory-limit: "2Gi"
79-
# - id: 01_hello_priv
80-
# container-specs:
81-
# - image: "openanalytics/shinyproxy-demo"
82-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
83-
# port-mapping:
84-
# default: 3838
85-
# privileged: true
86-
# - id: 01_hello_patches1
87-
# container-specs:
88-
# - image: "openanalytics/shinyproxy-demo"
89-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
90-
# port-mapping:
91-
# default: 3838
92-
# kubernetes-pod-patches: |
93-
# - op: replace
94-
# path: /metadata/namespace
95-
# value: itest-overridden
96-
# - op: add
97-
# path: /spec/containers/0/resources
98-
# value:
99-
# requests:
100-
# cpu: "1"
101-
# limits:
102-
# cpu: "1"
103-
# - op: add
104-
# path: /spec/serviceAccountName
105-
# value: sp-ittest-b9fa0a24-account
106-
# - id: 01_hello_patches2
107-
# container-specs:
108-
# - image: "openanalytics/shinyproxy-demo"
109-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
110-
# port-mapping:
111-
# default: 3838
112-
# volumes:
113-
# - "/srv/myvolume1:/srv/myvolume1"
114-
# env:
115-
# VAR1: VALUE1
116-
# kubernetes-pod-patches: |
117-
# - op: add
118-
# path: /spec/containers/0/volumeMounts/0
119-
# value:
120-
# mountPath: /cache
121-
# name: cache-volume
122-
# - op: add
123-
# path: /spec/volumes/0
124-
# value:
125-
# name: cache-volume
126-
# emptyDir: {}
127-
# - op: add
128-
# path: /spec/containers/0/env/-
129-
# value:
130-
# name: ADDED_VAR
131-
# value: VALUE
132-
# - id: 01_hello_manifests
133-
# container-specs:
134-
# - image: "openanalytics/shinyproxy-demo"
135-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
136-
# port-mapping:
137-
# default: 3838
138-
# kubernetes-pod-patches: |
139-
# - op: replace
140-
# path: /metadata/namespace
141-
# value: itest-overridden
142-
# kubernetes-additional-manifests:
143-
# - |
144-
# apiVersion: v1
145-
# kind: PersistentVolumeClaim
146-
# metadata:
147-
# name: manifests-pvc
148-
# namespace: itest-overridden
149-
# spec:
150-
# storageClassName: standard
151-
# accessModes:
152-
# - ReadWriteOnce
153-
# resources:
154-
# requests:
155-
# storage: 5Gi
156-
# - |
157-
# apiVersion: v1
158-
# kind: Secret
159-
# metadata:
160-
# name: manifests-secret
161-
# type: Opaque
162-
# data:
163-
# password: cGFzc3dvcmQ=
164-
# - id: 01_hello_manifests_espression
165-
# container-specs:
166-
# - image: "openanalytics/shinyproxy-demo"
167-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
168-
# port-mapping:
169-
# default: 3838
170-
# kubernetes-pod-patches: |
171-
# - op: add
172-
# path: /spec/containers/0/env/-
173-
# value:
174-
# name: CUSTOM_USERNAME
175-
# value: "#{proxy.userId}"
176-
# - op: add
177-
# path: /spec/containers/0/env/-
178-
# value:
179-
# name: PROXY_ID
180-
# value: "#{proxy.id}"
181-
# - op: add
182-
# path: /spec/volumes
183-
# value:
184-
# - name: "home-dir-pvc-#{proxy.userId}"
185-
# persistentVolumeClaim:
186-
# claimName: "home-dir-pvc-#{proxy.userId}"
187-
# - op: add
188-
# path: /spec/containers/0/volumeMounts
189-
# value:
190-
# - mountPath: "/home/#{proxy.userId}"
191-
# name: "home-dir-pvc-#{proxy.userId}"
192-
# kubernetes-additional-manifests:
193-
# - |
194-
# apiVersion: v1
195-
# kind: PersistentVolumeClaim
196-
# metadata:
197-
# name: "home-dir-pvc-#{proxy.userId}"
198-
# spec:
199-
# accessModes:
200-
# - ReadWriteOnce
201-
# resources:
202-
# requests:
203-
# storage: 5Gi
204-
# - id: 02_hello
205-
# container-specs:
206-
# - image: "openanalytics/shinyproxy-demo"
207-
# cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
208-
# port-mapping:
209-
# default: 3838
210-
# - id: 01_hello_manifests_persistent # 11
211-
# container-specs:
212-
# - image: "openanalytics/shinyproxy-demo"
213-
# cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
214-
# port-mapping:
215-
# default: 3838
216-
# kubernetes-pod-patches: |
217-
# - op: replace
218-
# path: /metadata/namespace
219-
# value: itest-overridden
220-
# kubernetes-additional-manifests:
221-
# - |
222-
# apiVersion: v1
223-
# kind: Secret
224-
# metadata:
225-
# name: manifests-secret
226-
# type: Opaque
227-
# data:
228-
# password: cGFzc3dvcmQ=
229-
# kubernetes-additional-persistent-manifests:
230-
# - |
231-
# apiVersion: v1
232-
# kind: PersistentVolumeClaim
233-
# metadata:
234-
# name: manifests-pvc
235-
# namespace: itest-overridden
236-
# spec:
237-
# storageClassName: standard
238-
# accessModes:
239-
# - ReadWriteOnce
240-
# resources:
241-
# requests:
242-
# storage: 5Gi
243-
# - id: 01_hello_advanced_runtime_labels # 12
244-
# container-specs:
245-
# - image: "openanalytics/shinyproxy-demo"
246-
# cmd: [ "R", "-e", "shinyproxy::run_01_hello()" ]
247-
# port-mapping:
248-
# default: 3838
249-
# env:
250-
# TEST_PROXY_ID: "#{proxy.getRuntimeValue('SHINYPROXY_PROXY_ID')}"
251-
# SHINYPROXY_USERNAME: "abc_xyz"
252-
# TEST_INSTANCE_ID: "#{proxy.getRuntimeValue('SHINYPROXY_INSTANCE')}"
253-
# labels:
254-
# custom_username_label: "#{proxy.getRuntimeValue('SHINYPROXY_USERNAME')}"
255-
# kubernetes-pod-patches: |
256-
# - op: add
257-
# path: /spec/containers/0/env/-
258-
# value:
259-
# name: SHINYPROXY_USERNAME_PATCH
260-
# value: "#{proxy.getRuntimeValue('SHINYPROXY_USERNAME')}"
261-
# - op: add
262-
# path: /metadata/labels/custom_label_patch_instance
263-
# value: "#{proxy.getRuntimeValue('SHINYPROXY_INSTANCE')}"

0 commit comments

Comments
 (0)