Skip to content

Commit 034a7b1

Browse files
author
Joan Fontanals
authored
fix: fix install issue (#6037)
Signed-off-by: Joan Fontanals Martinez <[email protected]>
1 parent 7123bca commit 034a7b1

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ jobs:
188188
pip install docarray==0.21.0
189189
jina
190190
export JINA_LOG_LEVEL="ERROR"
191+
curl -LO https://dl.k8s.io/release/v1.21.1/bin/linux/amd64/kubectl
192+
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
191193
env:
192194
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
193195
- name: Test k8s Flow
@@ -228,6 +230,8 @@ jobs:
228230
pip install docarray==0.21.0
229231
jina
230232
export JINA_LOG_LEVEL="ERROR"
233+
curl -LO https://dl.k8s.io/release/v1.21.1/bin/linux/amd64/kubectl
234+
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
231235
env:
232236
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
233237
- name: Test k8s Deployment
@@ -268,6 +272,8 @@ jobs:
268272
pip install docarray==0.21.0
269273
jina
270274
export JINA_LOG_LEVEL="ERROR"
275+
curl -LO https://dl.k8s.io/release/v1.21.1/bin/linux/amd64/kubectl
276+
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
271277
env:
272278
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
273279
- name: Test graceful request handling on k8s
@@ -308,6 +314,8 @@ jobs:
308314
pip install docarray==0.21.0
309315
jina
310316
export JINA_LOG_LEVEL="ERROR"
317+
curl -LO https://dl.k8s.io/release/v1.21.1/bin/linux/amd64/kubectl
318+
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
311319
env:
312320
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
313321
- name: Test k8s failures
@@ -349,6 +357,8 @@ jobs:
349357
pip install docarray==0.21.0
350358
jina
351359
export JINA_LOG_LEVEL="ERROR"
360+
curl -LO https://dl.k8s.io/release/v1.21.1/bin/linux/amd64/kubectl
361+
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
352362
env:
353363
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
354364
- name: Test K8s with OpenTelemetry

extra-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ opentelemetry-api>=1.12.0: core
3939
opentelemetry-instrumentation-grpc>=0.35b0: core
4040
uvloop: perf,standard,devel
4141
prometheus_client>=0.12.0: perf,standard,devel
42-
opentelemetry-sdk>=1.14.0: perf,standard,devel
42+
opentelemetry-sdk>=1.14.0,<1.20.0: perf,standard,devel
4343
opentelemetry-exporter-otlp>=1.12.0: perf,standard,devel
4444
opentelemetry-exporter-prometheus>=1.12.0rc1: perf,standard,devel
4545
opentelemetry-instrumentation-aiohttp-client>=0.33b0: perf,standard,devel

jina/resources/extra-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ opentelemetry-api>=1.12.0: core
3939
opentelemetry-instrumentation-grpc>=0.35b0: core
4040
uvloop: perf,standard,devel
4141
prometheus_client>=0.12.0: perf,standard,devel
42-
opentelemetry-sdk>=1.14.0: perf,standard,devel
42+
opentelemetry-sdk>=1.14.0,<1.20.0: perf,standard,devel
4343
opentelemetry-exporter-otlp>=1.12.0: perf,standard,devel
4444
opentelemetry-exporter-prometheus>=1.12.0rc1: perf,standard,devel
4545
opentelemetry-instrumentation-aiohttp-client>=0.33b0: perf,standard,devel

tests/k8s/conftest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, kind_cluster: KindCluster, logger: JinaLogger) -> None:
2626
)
2727
self._log = logger
2828
self._set_kube_config()
29-
self._install_linkderd(kind_cluster)
29+
self._install_linkerd(kind_cluster)
3030
self._loaded_images = set()
3131

3232
def _linkerd_install_cmd(
@@ -69,7 +69,7 @@ def _linkerd_install_cmd(
6969
if returncode is not None and returncode != 0:
7070
raise Exception(f'Installing {tool_name} failed with {returncode}')
7171

72-
def _install_linkderd(self, kind_cluster: KindCluster) -> None:
72+
def _install_linkerd(self, kind_cluster: KindCluster) -> None:
7373
# linkerd < 2.12: only linkerd install is needed
7474
# in later versions, linkerd install --crds will be needed
7575
self._linkerd_install_cmd(
@@ -86,11 +86,11 @@ def _install_linkderd(self, kind_cluster: KindCluster) -> None:
8686
print(f'linkerd check yields {out.decode() if out else "nothing"}')
8787
except subprocess.CalledProcessError as e:
8888
print(
89-
f'linkerd check failed with error code { e.returncode } and output { e.output }'
89+
f'linkerd check failed with error code { e.returncode } and output { e.output }, and stderr { e.stderr }'
9090
)
9191
raise
9292

93-
def install_linkderd_smi(self) -> None:
93+
def install_linkerd_smi(self) -> None:
9494
self._log.info('Installing Linkerd SMI to Cluster...')
9595
proc = subprocess.Popen(
9696
[f'{Path.home()}/.linkerd2/bin/linkerd-smi', 'install'],

tests/k8s/test_k8s_failures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ async def async_inputs(sent_ids: Set[int], sleep_time: float = 0.05):
210210

211211

212212
def inject_failures(k8s_cluster, logger):
213-
k8s_cluster.install_linkderd_smi()
213+
k8s_cluster.install_linkerd_smi()
214214
logger.info(f'Inject random failures into test cluster')
215215
proc = subprocess.Popen(
216216
[

tests/k8s/test_k8s_flow.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -960,17 +960,21 @@ async def test_flow_with_external_k8s_deployment(logger, docker_images, tmpdir):
960960
@pytest.mark.asyncio
961961
@pytest.mark.timeout(3600)
962962
@pytest.mark.parametrize('grpc_metadata', [{}, {"key1": "value1"}])
963-
async def test_flow_with_metadata_k8s_deployment(logger, grpc_metadata, tmpdir):
963+
@pytest.mark.parametrize(
964+
'docker_images',
965+
[['jinaai/jina']],
966+
indirect=True,
967+
)
968+
async def test_flow_with_metadata_k8s_deployment(logger, grpc_metadata, docker_images, tmpdir):
964969
from kubernetes import client
965970

966971
namespace = 'test-flow-with-metadata-k8s-deployment'.lower()
967972
api_client = client.ApiClient()
968973
core_client = client.CoreV1Api(api_client=api_client)
969974
app_client = client.AppsV1Api(api_client=api_client)
970975
try:
971-
docker_images = ['test-executor', 'jinaai/jina']
972-
973-
await _create_external_deployment(api_client, app_client, docker_images, tmpdir)
976+
images = ['test-executor']
977+
await _create_external_deployment(api_client, app_client, images, tmpdir)
974978

975979
flow = Flow(name='k8s_flow-with_metadata_deployment').add(
976980
name='external_executor',

0 commit comments

Comments
 (0)