Skip to content

Commit

Permalink
fix: Add cinder netapp container type
Browse files Browse the repository at this point in the history
This change installs the image conversion tools needed to allow for boot
from volume.

Co-Authored-By: Dan With <[email protected]>
Signed-off-by: Kevin Carter <[email protected]>
  • Loading branch information
cloudnull and dwith committed Nov 8, 2024
1 parent af9efa3 commit d67a231
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 1 deletion.
64 changes: 64 additions & 0 deletions .github/workflows/release-cinder-netapp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#
name: Create and publish a the Cinder RXT compatible image

# Configures this workflow to run every time a change is pushed to the branch called `release`.
on:
workflow_dispatch:
inputs:
imageTag:
description: 'Set tag for the image'
required: true
default: 'master-ubuntu_jammy'
type: choice
options:
- master-ubuntu_jammy
- 2023.1-ubuntu_jammy
- 2023.2-ubuntu_jammy
- 2024.1-ubuntu_jammy

# 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 }}

# 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 }}
# 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/Cinder-volume-netapp-Containerfile
push: true
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/cinder-volume-rxt:${{ github.event.inputs.imageTag }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/cinder-volume-rxt:${{ github.event.inputs.imageTag }}-${{ env.MY_DATE }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
VERSION=${{ github.event.inputs.imageTag }}
41 changes: 41 additions & 0 deletions .github/workflows/smoke-cinder-netapp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
name: Run build check for the Cinder Volume Netapp RXT compatible image

on:
pull_request:
paths:
- Containerfiles/Cinder-volume-netapp-Containerfile

# 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 }}

# 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: read
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 }}
- name: Build Docker image
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: .
file: Containerfiles/Cinder-volume-netapp-Containerfile
push: false
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/keystone-rxt:master-ubuntu_jammy
build-args: |
VERSION=master-ubuntu_jammy
6 changes: 6 additions & 0 deletions Containerfiles/Cinder-volume-netapp-Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ARG VERSION=master-ubuntu_jammy
FROM openstackhelm/cinder:$VERSION as build
RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y systemctl open-iscsi qemu-block-extra qemu-utils multipath-tools; \
rm -rf /var/cache/apt/archives /var/lib/apt/lists; \
apt clean; /var/lib/openstack/bin/pip install pygobject; \
find /var/lib/openstack -regex '^.*\(__pycache__\|\.py[co]\)$' -delete
3 changes: 2 additions & 1 deletion base-kustomize/cinder/netapp/deploy-volume-netapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ spec:
topologyKey: kubernetes.io/hostname
weight: 10
nodeSelector:
openstack-control-plane: enabled
openstack-storage-node: enabled
initContainers:
- name: init
image: image-kubernetes-entrypoint-init
imagePullPolicy: IfNotPresent
securityContext:
privledged: true
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsUser: 65534
Expand Down

0 comments on commit d67a231

Please sign in to comment.