airship/armada
Code Issues Proposed changes

Fix deprecated pkg_resources module

Browse Source 
Also moved to quay.ioairshipit for base repo of
ubuntu and uplisted armada-go binary form
ubuntu_jammy image

Change-Id: I805c8364ffe558d2cb4d0108314d1a1afad6facb
This commit is contained in:
Sergiy Markin 2024-12-23 03:53:14 +00:00
parent af4bf814f3
commit 373e45ec81
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
armada/handlers/schema.py
View File

@ -14,8 +14,8 @@
import os import os
import re import re
from importlib.resources import files
import pkg_resources
import yaml import yaml
# Types # Types
@ -57,7 +57,7 @@ def _get_schema_info(name, data):
def _get_schema_dir(): def _get_schema_dir():
return pkg_resources.resource_filename('armada', 'schemas') return str(files('armada') / 'schemas')
def _load_schemas(): def _load_schemas():

4
images/armada/Dockerfile.ubuntu_jammy
View File

@ -4,8 +4,8 @@
# 429 Too Many Requests - Server message: too many requests: # 429 Too Many Requests - Server message: too many requests:
# You have reached your pull rate limit. # You have reached your pull rate limit.
# You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit # You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy ARG FROM=quay.io/airshipit/ubuntu:jammy
ARG ARMADA_GO=quay.io/airshipit/armada-go:latest-ubuntu_focal ARG ARMADA_GO=quay.io/airshipit/armada-go:latest-ubuntu_jammy
FROM ${ARMADA_GO} AS armada_go FROM ${ARMADA_GO} AS armada_go
FROM ${FROM} FROM ${FROM}