Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade metering stack to 2024.1 #398

Merged
merged 50 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e929f6c
feat: add postgres operator and cluster
LukeRepko Jun 12, 2024
f2f28b3
feat: update postgres operator to 1.12.2
LukeRepko Aug 5, 2024
ed0fa6e
fix: bump shared buffers max conns and vol size
LukeRepko Aug 5, 2024
48a17e7
fix: add cluster to pg system ns
LukeRepko Aug 5, 2024
d48a0b8
fix: use new postgres-cluster hostname
LukeRepko Aug 5, 2024
f60a3bd
fix: move cluster to openstack namespace
LukeRepko Aug 5, 2024
5bc707d
fix: disable deprecated ha queues
LukeRepko Aug 5, 2024
09b83b2
fix: explicitly set durable queues false
LukeRepko Aug 5, 2024
18f51e3
fix: disable amqp durable queues for cinder
LukeRepko Aug 5, 2024
556efff
fix: make admin endpoint keystone-api
LukeRepko Aug 5, 2024
6760a4b
feat: begin to add custom gnocchi container
LukeRepko Aug 6, 2024
77ffc35
feat: add gh workflow for building gnocchi
LukeRepko Aug 6, 2024
59495f3
fix: convert repo name to lowercase
LukeRepko Aug 6, 2024
b3ef76b
feat: replace gnocchi api image with custom one
LukeRepko Aug 6, 2024
98a1bf1
fix: apache2 needs this to start
LukeRepko Aug 6, 2024
0c42d95
fix: install apache2-mod-wsgi after py3
LukeRepko Aug 6, 2024
9589942
fix: need the gnocchi user to exist
LukeRepko Aug 6, 2024
d2e3021
fix: update path to gnocchi module
LukeRepko Aug 6, 2024
1cdfe66
fix: push events don't inherit default inputs
LukeRepko Aug 6, 2024
5c27c7d
fix: only build on push if container changed
LukeRepko Aug 6, 2024
7a6d1f8
fix: specify required drivers during install
LukeRepko Aug 6, 2024
44357d3
fix: pass default push_version to build-args
LukeRepko Aug 6, 2024
f7e5c52
fix: add apt dependencies for source builds
LukeRepko Aug 6, 2024
6b9294c
fix: dir is created automatically now
LukeRepko Aug 6, 2024
5d6a649
fix: memcache is required by keystone
LukeRepko Aug 6, 2024
939823f
fix: pymemcache is also needed
LukeRepko Aug 6, 2024
e5f063e
fix: redirect apache2 errorlog to stderr
LukeRepko Aug 6, 2024
8e93a2d
feat: update remaining image tags
LukeRepko Aug 6, 2024
2b3ef60
fix: db-init expects python
LukeRepko Aug 6, 2024
c107375
fix: pymysql is needed by db-init
LukeRepko Aug 6, 2024
67d0d19
fix: sqlalchemy>2 has breaking changes
LukeRepko Aug 6, 2024
24606ec
fix: re-enable db-init job
LukeRepko Aug 7, 2024
4c95e2a
fix: refactor image tag name and build version opt
LukeRepko Aug 7, 2024
2e0124f
fix: normalize image tag name
LukeRepko Aug 7, 2024
7c7d4e6
fix: reduce gnocchi image footprint
LukeRepko Aug 7, 2024
c884d8e
feat: let changes to main branch trigger build
LukeRepko Aug 7, 2024
3b6bcbe
feat: begin to add custom ceilometer image
LukeRepko Aug 7, 2024
3fed404
fix: update ceilometer tags to custom image
LukeRepko Aug 7, 2024
cb1c01f
fix: add additional requirements for ceilometer
LukeRepko Aug 7, 2024
5c681a5
fix: update event definitions to match 2024.1
LukeRepko Aug 7, 2024
c9a04ee
fix: update gnocchi_resources to match 2024.1
LukeRepko Aug 7, 2024
37ebe5a
fix: update meters to match 2024.1
LukeRepko Aug 7, 2024
5854fe9
fix: replace remaining images with 2024.1
LukeRepko Aug 7, 2024
d7edb1d
fix: remove duplicate dictionary from ipmi
LukeRepko Aug 8, 2024
acdcffa
fix: change event publisher to gnocchi
LukeRepko Aug 8, 2024
aa8f2cc
feat: add aio overlay for postgres
LukeRepko Aug 8, 2024
ce12629
docs: add new postgres operator install info
LukeRepko Aug 9, 2024
873d5f5
docs: update gnocchi installation info
LukeRepko Aug 9, 2024
102921f
fix: change repo for gnocchi and ceilometer images
LukeRepko Aug 9, 2024
aecf327
fix: remove empty line from end of svg
LukeRepko Aug 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions .github/workflows/release-ceilometer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#
name: Create and publish a Ceilometer image

on:
push:
paths:
- '.github/workflows/release-ceilometer.yaml'
- 'Containerfiles/CeilometerRXT-Containerfile'
branches:
- development
- main
workflow_dispatch:
inputs:
imageTag:
description: 'Set tag for the image'
required: true
default: '2024.1-ubuntu_jammy'
type: choice
options:
- 2024.1-ubuntu_jammy
buildVersion:
description: 'Set version to build'
required: true
default: 'stable/2024.1'
type: choice
options:
- stable/2024.1
- master

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
DEF_TAG_NAME: 2024.1-ubuntu_jammy
DEF_BUILD_VERSION: stable/2024.1

# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
jobs:
build-and-push-image:
runs-on: ubuntu-latest
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
# ghcr only allows lowercase repository names
- name: lowercase repo name
run: |
echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
- name: Dynamically set MY_DATE environment variable
run: echo "MY_DATE=$(date +%s)" >> $GITHUB_ENV
- name: Build and push Docker image
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: .
file: Containerfiles/CeilometerRXT-Containerfile
push: true
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ceilometer:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ceilometer:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
VERSION=${{ github.event.inputs.buildVersion || env.DEF_BUILD_VERSION}}
82 changes: 82 additions & 0 deletions .github/workflows/release-gnocchi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
#
name: Create and publish a Gnocchi image

on:
push:
paths:
- '.github/workflows/release-gnocchi.yaml'
- 'Containerfiles/GnocchiRXT-Containerfile'
branches:
- development
- main
workflow_dispatch:
inputs:
imageTag:
description: 'Set tag for the image'
required: true
default: '2024.1-ubuntu_jammy'
type: choice
options:
- 2024.1-ubuntu_jammy
buildVersion:
description: 'Set version to build'
required: true
default: '4.6.2'
type: choice
options:
- 4.6.2
- stable/4.6
- master

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
DEF_TAG_NAME: 2024.1-ubuntu_jammy
DEF_BUILD_VERSION: 4.6.2

# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
jobs:
build-and-push-image:
runs-on: ubuntu-latest
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
# ghcr only allows lowercase repository names
- name: lowercase repo name
run: |
echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
- name: Dynamically set MY_DATE environment variable
run: echo "MY_DATE=$(date +%s)" >> $GITHUB_ENV
- name: Build and push Docker image
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: .
file: Containerfiles/GnocchiRXT-Containerfile
push: true
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/gnocchi:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/gnocchi:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
VERSION=${{ github.event.inputs.buildVersion || env.DEF_BUILD_VERSION}}
26 changes: 26 additions & 0 deletions Containerfiles/CeilometerRXT-Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:22.04
ARG VERSION=""
ENV CEILOMETER_VERSION ${VERSION:-master}
ENV DEBIAN_FRONTEND=noninteractive
RUN apt update && \
apt install -y software-properties-common && \
add-apt-repository ppa:deadsnakes/ppa -y
RUN apt update && \
apt install -y \
python3.10 \
python3.10-dev \
python3-memcache \
git \
wget \
curl \
locales \
build-essential \
pkg-config \
libvirt-dev
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 && \
pip install \
"ceilometer @ git+https://opendev.org/openstack/ceilometer.git@${CEILOMETER_VERSION}" \
"libvirt-python"
RUN ln -s /usr/bin/python3 /usr/bin/python && \
adduser ceilometer --disabled-password && \
apt clean && rm -rf /var/lib/apt/lists/*
39 changes: 39 additions & 0 deletions Containerfiles/GnocchiRXT-Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
FROM ubuntu:22.04
ARG VERSION=""
ENV GNOCCHI_VERSION ${VERSION:-master}
ENV DEBIAN_FRONTEND=noninteractive
RUN apt update && \
apt install -y software-properties-common && \
add-apt-repository ppa:deadsnakes/ppa -y
RUN apt update && \
apt install -y \
python3.10 \
python3.10-dev \
python3-memcache \
git \
wget \
curl \
apache2 \
locales \
libapache2-mod-wsgi-py3 \
build-essential \
libffi-dev \
libpq-dev \
postgresql \
memcached \
librados-dev \
liberasurecode-dev \
python3-rados \
ceph \
libsnappy-dev \
libprotobuf-dev
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 && \
pip install \
"gnocchi[postgresql,ceph,keystone] @ git+https://github.com/gnocchixyz/gnocchi.git@${GNOCCHI_VERSION}" \
"pymemcache" \
"pymysql" \
"sqlalchemy>=1.4.24,<2"
RUN ln -s /usr/bin/python3 /usr/bin/python && \
adduser gnocchi --disabled-password && \
sed -i 's@^ErrorLog.*@ErrorLog /dev/stderr@' /etc/apache2/apache2.conf && \
apt clean && rm -rf /var/lib/apt/lists/*
Loading
Loading