set images to pull from configured registries

Add yaml to the fluxcd manifest which is compatible with the platform's
image pull and service parameter registry override handling.  The
platform will pull the image and populate registry.local, and the vault
injector agent will pull from registry.local.

Story: 2010393
Task: 47927

Test Plan:
PASS: sysinv.log shows that agentImage image is pulled when vault
      server image is hardcoded differently
PASS: agent image pulls when public network is blocked
PASS: agent image pulls when it is different than vault server image
PASS: vault app test, including vault un-aware application

Change-Id: Idd1215744bb31881127a6be23cf570166c79fad8
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
This commit is contained in:
Michel Thebeau 2023-05-02 12:39:29 -04:00
parent 1dab2dbf8f
commit 198f4e5164
3 changed files with 42 additions and 1 deletions

View File

@ -28,7 +28,15 @@ injector:
repository: hashicorp/vault-k8s
tag: 0.14.2
agentImage:
repository: hashicorp/vault
# Add yaml compatible with starlingx platform image pull, and
# service-parameter registry overrides. This will pull from
# private or public registry into registry.local. docker.io
# registry is assumed when omitted:
image:
repository: hashicorp/vault
tag: 1.9.2
# Set the vault yaml to refer to registry.local pulled as above
repository: registry.local:9001/docker.io/hashicorp/vault
tag: 1.9.2
tolerations: |
- key: "node-role.kubernetes.io/master"

View File

@ -0,0 +1,32 @@
From 4df036228070727d83a370bf7c2d98e6cf7e1a48 Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Tue, 2 May 2023 14:59:18 -0400
Subject: [PATCH] Add yaml for starlingx image handling
Add values yaml compatible with starlingx platform's image pull and
service parameter registry override handling. The platform will pull
the image and populate registry.local, and the vault injector agent will
pull from registry.local.
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
values.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/values.yaml b/values.yaml
index aff058b..04e1e72 100644
--- a/values.yaml
+++ b/values.yaml
@@ -93,6 +93,9 @@ injector:
# containers. This should be set to the official Vault image. Vault 1.3.1+ is
# required.
agentImage:
+ image:
+ repository: "hashicorp/vault"
+ tag: "1.9.2"
repository: "hashicorp/vault"
tag: "1.9.2"
--
2.25.1

View File

@ -1 +1,2 @@
0001-Add-vault-manager-repository-to-values.yaml.patch
0001-Add-yaml-for-starlingx-image-handling.patch