Skip to content

Commit

Permalink
Updated kfam (#107)
Browse files Browse the repository at this point in the history
* Updated kfam

* bump version

* updated version

* use base in format `ubuntu@22.04`
  • Loading branch information
TakoB222 authored Jul 19, 2024
1 parent ea0754e commit 9ece740
Show file tree
Hide file tree
Showing 3 changed files with 123 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kfam/rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
name: kfam
summary: Kubeflow Access Management API
description: Kubeflow Access Management API provides fine-grain user-namespace level access control.
version: "v1.7.0_1"
version: "v1.8.0"
license: Apache-2.0
base: ubuntu:22.04
base: ubuntu@22.04

platforms:
amd64:
Expand All @@ -27,7 +27,7 @@ parts:
source: https://github.com/kubeflow/kubeflow.git
source-subdir: components/access-management
source-type: git
source-tag: v1.7.0
source-tag: v1.8.0
build-environment:
- CGO_ENABLED: 0
- GOOS: linux
Expand Down
69 changes: 69 additions & 0 deletions kfam/tests/test_rock.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Copyright 2024 Canonical Ltd.
# See LICENSE file for licensing details.
#
#

from pathlib import Path

import os
import logging
import random
import pytest
import string
import subprocess
import yaml

from charmed_kubeflow_chisme.rock import CheckRock


@pytest.fixture()
def rock_test_env(tmpdir):
"""Yields a temporary directory and random docker container name, then cleans them up after."""
container_name = "".join(
[str(i) for i in random.choices(string.ascii_lowercase, k=8)]
)
yield tmpdir, container_name

try:
subprocess.run(["docker", "rm", container_name])
except Exception:
pass
# tmpdir fixture we use here should clean up the other files for us


@pytest.mark.abort_on_fail
def test_rock(rock_test_env):
"""Test rock."""
temp_dir, container_name = rock_test_env
check_rock = CheckRock("rockcraft.yaml")
rock_image = check_rock.get_name()
rock_version = check_rock.get_version()
LOCAL_ROCK_IMAGE = f"{rock_image}:{rock_version}"

subprocess.run(
[
"docker",
"run",
"--rm",
LOCAL_ROCK_IMAGE,
"exec",
"ls",
"-la",
"/access-management",
],
check=True,
)

subprocess.run(
[
"docker",
"run",
"--rm",
LOCAL_ROCK_IMAGE,
"exec",
"ls",
"-la",
"/third_party/library/hashicorp",
],
check=True,
)
51 changes: 51 additions & 0 deletions kfam/tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Copyright 2024 Canonical Ltd.
# See LICENSE file for licensing details.
[tox]
skipsdist = True
skip_missing_interpreters = True
envlist = pack, export-to-docker, sanity, integration

[testenv]
setenv =
PYTHONPATH={toxinidir}
PYTHONBREAKPOINT=ipdb.set_trace

[testenv:pack]
passenv = *
allowlist_externals =
rockcraft
commands =
rockcraft pack

[testenv:export-to-docker]
passenv = *
allowlist_externals =
bash
skopeo
yq
commands =
# export rock to docker
bash -c 'NAME=$(yq eval .name rockcraft.yaml) && \
VERSION=$(yq eval .version rockcraft.yaml) && \
ARCH=$(yq eval ".platforms | keys | .[0]" rockcraft.yaml) && \
ROCK="$\{NAME\}_$\{VERSION\}_$\{ARCH\}.rock" && \
DOCKER_IMAGE=$NAME:$VERSION && \
echo "Exporting $ROCK to docker as $DOCKER_IMAGE" && \
skopeo --insecure-policy copy oci-archive:$ROCK docker-daemon:$DOCKER_IMAGE'

[testenv:sanity]
passenv = *
deps =
pytest
charmed-kubeflow-chisme
commands =
# run rock tests
pytest -s -v --tb native --show-capture=all --log-cli-level=INFO {posargs} {toxinidir}/tests

[testenv:integration]
passenv = *
allowlist_externals =
echo
commands =
# TODO: Implement integration tests here
echo "WARNING: This is a placeholder test - no test is implemented here."

0 comments on commit 9ece740

Please sign in to comment.