openstack
/
openstack-helm-images
Code Issues Proposed changes

Merge "Change NPD version to v0.8.14 for Focal add Jammy image"

This commit is contained in:
Zuul 2024-03-06 15:29:27 +00:00 committed by Gerrit Code Review
parent 57ada7ba36 0bf6ec34c2
commit 16baf66241
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-problem-detector/Dockerfile.ubuntu_focal
View File

@ -1,7 +1,7 @@
ARG FROM=docker.io/ubuntu:focal ARG FROM=docker.io/ubuntu:focal
FROM ${FROM} FROM ${FROM}
ARG NPD_VERSION="v0.8.15" ARG NPD_VERSION="v0.8.14"
ARG NPD_SRC_URL="https://github.com/kubernetes/node-problem-detector/releases/download/${NPD_VERSION}" ARG NPD_SRC_URL="https://github.com/kubernetes/node-problem-detector/releases/download/${NPD_VERSION}"
RUN apt-get update ;\ RUN apt-get update ;\

2
node-problem-detector/Dockerfile.ubuntu_bionic → node-problem-detector/Dockerfile.ubuntu_jammy
View File

@ -1,4 +1,4 @@
ARG FROM=docker.io/ubuntu:bionic ARG FROM=docker.io/ubuntu:jammy
FROM ${FROM} FROM ${FROM}
ARG NPD_VERSION="v0.8.15" ARG NPD_VERSION="v0.8.15"

2
node-problem-detector/build.sh
View File

@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/..
IMAGE="node-problem-detector" IMAGE="node-problem-detector"
VERSION=${VERSION:-latest} VERSION=${VERSION:-latest}
DISTRO=${DISTRO:-ubuntu_focal} DISTRO=${DISTRO:-ubuntu_jammy}
REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}

6
zuul.d/node-problem-detector.yaml
View File

@ -37,10 +37,10 @@
docker_images: docker_images:
- context: node-problem-detector - context: node-problem-detector
repository: openstackhelm/node-problem-detector repository: openstackhelm/node-problem-detector
dockerfile: Dockerfile.ubuntu_focal dockerfile: Dockerfile.ubuntu_jammy
tags: tags:
- latest-ubuntu_focal - latest-ubuntu_jammy
- "ubuntu_focal-{{ currentdate }}" - "ubuntu_jammy-{{ currentdate }}"
files: &node-problem-detector_files files: &node-problem-detector_files
- node-problem-detector/.* - node-problem-detector/.*
- zuul.d/node-problem-detector.yaml - zuul.d/node-problem-detector.yaml