Remove vault armada app build
As part of Armada deprecation we need to remove all Armada application builds for all applications that have been migrated to FluxCD. This patch removes the armada app build from centos and debian. TEST PLAN: PASS: Build centos PASS: Build debian PASS: deb package does not have armada tarball PASS: rpm package does not have armada tarball PASS: FluxCD tarball is unchanged Story: 2009138 Task: 46047 Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com> Change-Id: I7ca4347c0918e6e46330b7c2e13ed1e5f8cf7d57
This commit is contained in:
@@ -12,4 +12,4 @@ COPY_LIST_TO_TAR="\
|
||||
# Keep the SRCREV in sync with python-k8sapp-vault so the app version is
|
||||
# the same as the plugin version
|
||||
TIS_BASE_SRCREV=77715cf9146c04c401e6fdae51cd865953f82ef4
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
@@ -2,7 +2,6 @@
|
||||
%global app_name vault
|
||||
%global helm_repo stx-platform
|
||||
|
||||
%global armada_folder /usr/lib/armada
|
||||
|
||||
# Install location
|
||||
%global app_folder /usr/local/share/applications/helm
|
||||
@@ -35,15 +34,7 @@ BuildRequires: python-k8sapp-vault
|
||||
BuildRequires: python-k8sapp-vault-wheels
|
||||
|
||||
%description
|
||||
StarlingX Vault Helm Charts
|
||||
|
||||
%package armada
|
||||
Summary: StarlingX Vault Application Armada Helm Charts
|
||||
Group: base
|
||||
License: Apache-2.0
|
||||
|
||||
%description armada
|
||||
StarlingX Vault Application Armada Helm Charts
|
||||
StarlingX Vault FluxCD Helm Charts
|
||||
|
||||
%prep
|
||||
%setup -n helm-charts-vault-0-6-0-1.0.0
|
||||
@@ -67,13 +58,11 @@ kill %1
|
||||
|
||||
# Create a chart tarball compliant with sysinv kube-app.py
|
||||
%define app_staging %{_builddir}/staging
|
||||
%define app_tarball_armada %{app_name}-armada-%{version}-%{tis_patch_ver}.tgz
|
||||
%define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz
|
||||
|
||||
# Setup staging
|
||||
mkdir -p %{app_staging}
|
||||
cp files/metadata.yaml %{app_staging}
|
||||
cp manifests/vault_manifest.yaml %{app_staging}
|
||||
mkdir -p %{app_staging}/charts
|
||||
|
||||
# copy psp-rolebinding tar
|
||||
@@ -83,7 +72,6 @@ cp helm-charts/*.tgz %{app_staging}/charts
|
||||
cp %{helm_folder}/vault*.tgz %{app_staging}/charts
|
||||
|
||||
# Populate metadata
|
||||
cd %{app_staging}
|
||||
sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml
|
||||
sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml
|
||||
sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
|
||||
@@ -93,22 +81,13 @@ sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
|
||||
mkdir -p %{app_staging}/plugins
|
||||
cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
|
||||
|
||||
# calculate checksum of all files in app_staging
|
||||
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
|
||||
# package armada
|
||||
tar -zcf %{_builddir}/%{app_tarball_armada} -C %{app_staging}/ .
|
||||
|
||||
# switch back to source root
|
||||
cd -
|
||||
|
||||
# Prepare app_staging for fluxcd package
|
||||
rm -f %{app_staging}/vault_manifest.yaml
|
||||
|
||||
cp -R fluxcd-manifests %{app_staging}/
|
||||
|
||||
# calculate checksum of all files in app_staging
|
||||
cd %{app_staging}
|
||||
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
|
||||
|
||||
# package fluxcd app
|
||||
tar -zcf %{_builddir}/%{app_tarball_fluxcd} -C %{app_staging}/ .
|
||||
|
||||
@@ -120,13 +99,8 @@ rm -fr %{app_staging}
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}/%{app_folder}
|
||||
install -p -D -m 755 %{_builddir}/%{app_tarball_armada} %{buildroot}/%{app_folder}
|
||||
install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder}
|
||||
|
||||
%files armada
|
||||
%defattr(-,root,root,-)
|
||||
%{app_folder}/%{app_tarball_armada}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{app_folder}/%{app_tarball_fluxcd}
|
||||
|
@@ -16,5 +16,5 @@ Package: stx-vault-helm
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends}
|
||||
Description: StarlingX Vault Armada Helm Charts
|
||||
This package contains Armada helm charts for the vault application.
|
||||
Description: StarlingX Vault FluxCD Helm Charts
|
||||
This package contains FluxCD helm charts for the vault application.
|
||||
|
@@ -10,7 +10,6 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.')
|
||||
|
||||
export APP_NAME = vault
|
||||
export APP_VERSION = $(MAJOR).$(MINOR_PATCH)
|
||||
export APP_TARBALL_ARMADA = $(APP_NAME)-armada-$(APP_VERSION).tgz
|
||||
export APP_TARBALL_FLUXCD = $(APP_NAME)-$(APP_VERSION).tgz
|
||||
export HELM_REPO = stx-platform
|
||||
export STAGING = staging
|
||||
@@ -34,7 +33,6 @@ override_dh_auto_build:
|
||||
# Setup the staging directory.
|
||||
mkdir -p $(STAGING)
|
||||
cp files/metadata.yaml $(STAGING)
|
||||
cp manifests/*.yaml $(STAGING)
|
||||
mkdir -p $(STAGING)/charts
|
||||
cp helm-charts/*.tgz $(STAGING)/charts
|
||||
cp /usr/lib/helm/vault*.tgz $(STAGING)/charts
|
||||
@@ -48,12 +46,7 @@ override_dh_auto_build:
|
||||
mkdir -p $(STAGING)/plugins
|
||||
cp /plugins/$(APP_NAME)/*.whl $(STAGING)/plugins
|
||||
|
||||
# Create the app package for armada.
|
||||
cd $(STAGING) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
|
||||
tar cfz $(APP_TARBALL_ARMADA) -C $(STAGING)/ .
|
||||
|
||||
# Prepare staging for fluxcd package
|
||||
rm -f $(STAGING)/vault_manifest.yaml
|
||||
cp -R fluxcd-manifests $(STAGING)/
|
||||
|
||||
# calculate checksum of all files in staging for the fluxcd app
|
||||
@@ -67,7 +60,6 @@ override_dh_auto_build:
|
||||
override_dh_auto_install:
|
||||
# Install the app tar file.
|
||||
install -d -m 755 $(APP_FOLDER)
|
||||
install -p -D -m 755 $(APP_TARBALL_ARMADA) $(APP_FOLDER)
|
||||
install -p -D -m 755 $(APP_TARBALL_FLUXCD) $(APP_FOLDER)
|
||||
|
||||
override_dh_usrlocal:
|
||||
|
@@ -1,155 +0,0 @@
|
||||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: vault-psp-rolebinding
|
||||
data:
|
||||
chart_name: vault-psp-rolebinding
|
||||
release: vault-psp-rolebinding
|
||||
namespace: vault
|
||||
values:
|
||||
rolebindingNamespace: vault
|
||||
serviceAccount: vault
|
||||
source:
|
||||
location: http://172.17.0.1:8080/helm_charts/stx-platform/psp-rolebinding-0.1.0.tgz
|
||||
subpath: psp-rolebinding
|
||||
type: tar
|
||||
reference: master
|
||||
upgrade:
|
||||
no_hooks: false
|
||||
pre:
|
||||
delete:
|
||||
- labels:
|
||||
release_group: vault-psp-rolebinding
|
||||
type: job
|
||||
wait:
|
||||
labels:
|
||||
release_group: vault-psp-rolebinding
|
||||
resources: []
|
||||
timeout: 1800
|
||||
dependencies: []
|
||||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: vault
|
||||
data:
|
||||
chart_name: vault
|
||||
release: vault
|
||||
namespace: vault
|
||||
wait:
|
||||
timeout: 1800
|
||||
labels:
|
||||
app: vault
|
||||
install:
|
||||
no_hooks: false
|
||||
upgrade:
|
||||
no_hooks: false
|
||||
pre:
|
||||
delete:
|
||||
- type: job
|
||||
labels:
|
||||
app: vault
|
||||
values:
|
||||
global:
|
||||
enabled: true
|
||||
tlsDisable: false
|
||||
imagePullSecrets:
|
||||
- name: default-registry-key
|
||||
manager:
|
||||
image:
|
||||
repository: starlingx/stx-vault-manager
|
||||
tag: stx.5.0-v1.18.3
|
||||
tolerations: |
|
||||
- key: "node-role.kubernetes.io/master"
|
||||
operator: "Exists"
|
||||
effect: "NoSchedule"
|
||||
injector:
|
||||
enabled: true
|
||||
nodeSelector: |
|
||||
node-role.kubernetes.io/master: ""
|
||||
image:
|
||||
repository: hashicorp/vault-k8s
|
||||
tag: 0.4.0
|
||||
agentImage:
|
||||
repository: vault
|
||||
tag: 1.4.2
|
||||
tolerations: |
|
||||
- key: "node-role.kubernetes.io/master"
|
||||
operator: "Exists"
|
||||
effect: "NoSchedule"
|
||||
server:
|
||||
affinity: |
|
||||
podAntiAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
- labelSelector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: {{ template "vault.name" . }}
|
||||
app.kubernetes.io/instance: "{{ .Release.Name }}"
|
||||
component: server
|
||||
topologyKey: kubernetes.io/hostname
|
||||
image:
|
||||
repository: vault
|
||||
tag: 1.4.2
|
||||
tolerations: |
|
||||
- key: "node-role.kubernetes.io/master"
|
||||
operator: "Exists"
|
||||
effect: "NoSchedule"
|
||||
auditStorage:
|
||||
enabled: true
|
||||
size: 10Gi
|
||||
ha:
|
||||
enabled: true
|
||||
replicas: 3
|
||||
raft:
|
||||
enabled: true
|
||||
config: |
|
||||
ui = true
|
||||
|
||||
listener "tcp" {
|
||||
tls_disable = 0
|
||||
address = "[::]:8200"
|
||||
cluster_address = "[::]:8201"
|
||||
tls_cert_file = "/vault/userconfig/vault-server-tls/tls.crt"
|
||||
tls_key_file = "/vault/userconfig/vault-server-tls/tls.key"
|
||||
tls_client_ca_file = "/vault/userconfig/vault-server-tls/ca.crt"
|
||||
}
|
||||
|
||||
storage "raft" {
|
||||
path = "/vault/data"
|
||||
}
|
||||
|
||||
service_registration "kubernetes" {}
|
||||
extraLabels:
|
||||
app: vault
|
||||
extraEnvironmentVars:
|
||||
VAULT_CACERT: /vault/userconfig/vault-server-tls/ca.crt
|
||||
extraVolumes:
|
||||
- type: secret
|
||||
name: vault-server-tls
|
||||
source:
|
||||
type: tar
|
||||
location: http://172.17.0.1/helm_charts/stx-platform/vault-0.6.0.tgz
|
||||
subpath: vault
|
||||
reference: master
|
||||
dependencies: []
|
||||
---
|
||||
schema: armada/ChartGroup/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: vault
|
||||
data:
|
||||
description: "Deploy Vault"
|
||||
sequenced: false
|
||||
chart_group:
|
||||
- vault
|
||||
- vault-psp-rolebinding
|
||||
---
|
||||
schema: armada/Manifest/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: vault-manifest
|
||||
data:
|
||||
release_prefix: sva
|
||||
chart_groups:
|
||||
- vault
|
Reference in New Issue
Block a user