starlingx/ansible-playbooks
Code Issues Proposed changes

Upgrade trident templates to support Trident 23.04.0

Browse Source 
Upgrade trident .yaml templates, generated by tridentctl
23.04.0 with the following command:
tridentctl -n trident install --generate-custom-yaml

Test Plan:
PASS: Installed Trident 22.07.0 in STX 8.0 and wrote information into
Netapp. Upgraded STX to 9.0, upgrade trident to version 23.04.0 and
tested if the backend and PVCs created using Trident 22.07.0 still
worked.
PASS: Upgraded Trident to version 23.04.0 rerunning ansible-playbook
and tested if the information stored in Netapp persisted.
PASS: Tested on k8s v1.25.
PASS: Tested on k8s v1.26.

Story: 2010368
Task: 48321

Depends-On: https://review.opendev.org/c/starlingx/integ/+/885990

Change-Id: Ia2e6987255eb5a2093ccd49081802f7edfe7ea7a
Signed-off-by: Fernando Santos <Fernando.PereiradosSantos@windriver.com>
This commit is contained in:
Fernando Santos
2023-06-30 18:21:25 +00:00
parent 22b45d60e7
commit 4da4f380b0
5 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
playbookconfig/src/playbooks/host_vars/netapp/default.yml
View File

@@ -1,6 +1,6 @@
---
#
# Copyright (c) 2020 Wind River Systems, Inc.
# Copyright (c) 2020-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -45,14 +45,13 @@ trident_clean_folder: true
# Images that need to be pulled to the local registry
trident_images:
- docker.io/netapp/trident:22.07.0
- docker.io/netapp/trident-autosupport:22.07
- k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
- k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
- k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
- k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
- k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
- k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1
- docker.io/netapp/trident:23.04.0
- docker.io/netapp/trident-autosupport:23.04
- k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
- k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
- k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
- k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
- k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
# OVERRIDE FILES DIRECTORY
# ========================

4
playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml
View File

@@ -1,6 +1,6 @@
---
#
# Copyright (c) 2020 Wind River Systems, Inc.
# Copyright (c) 2020-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -83,7 +83,7 @@
- name: Install trident services
command: tridentctl -n {{ trident_namespace }} install --use-custom-yaml {{ trident_install_extra_params }}
args:
chdir: "{{ trident_setup_dir }}"
chdir: "{{ trident_setup_dir }}/setup"
environment:
KUBECONFIG: "/etc/kubernetes/admin.conf"
when: (tridentctl_rest_response.rc is defined and

4
playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2
View File

@@ -27,7 +27,7 @@ spec:
privileged: true
allowPrivilegeEscalation: true
# STX_change: pull image from local registry
image: {{ local_registry }}/docker.io/netapp/trident:22.07.0
image: {{ local_registry }}/docker.io/netapp/trident:23.04.0
command:
- /trident_orchestrator
args:
@@ -99,7 +99,7 @@ spec:
readOnly: true
- name: driver-registrar
# STX_change: pull image from local registry
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
args:
- "--v=2"
- "--csi-address=$(ADDRESS)"

16
playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2
View File

@@ -22,7 +22,7 @@ spec:
containers:
- name: trident-main
# STX_change: pull image from local registry
image: {{ local_registry }}/docker.io/netapp/trident:22.07.0
image: {{ local_registry }}/docker.io/netapp/trident:23.04.0
ports:
# STX_change: change ports
- containerPort: {{ trident_https_rest_api_port }}
@@ -79,17 +79,13 @@ spec:
- name: trident-autosupport
# STX_change: pull image from local registry
image: {{ local_registry }}/docker.io/netapp/trident-autosupport:22.07
image: {{ local_registry }}/docker.io/netapp/trident-autosupport:23.04
command:
- /usr/local/bin/trident-autosupport
args:
- "--k8s-pod"
- "--log-format=text"
- "--trident-silence-collector=false"
#- -debug
resources:
limits:
@@ -99,7 +95,7 @@ spec:
mountPath: /asup
- name: csi-provisioner
# STX_change: pull image from local registry
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
args:
- "--v=2"
- "--timeout=600s"
@@ -115,7 +111,7 @@ spec:
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-attacher
# STX_change: pull image from local registry
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
args:
- "--v=2"
- "--timeout=60s"
@@ -129,7 +125,7 @@ spec:
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-resizer
# STX_change: pull image from local registry
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
args:
- "--v=2"
- "--timeout=300s"
@@ -142,7 +138,7 @@ spec:
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter
# STX_change: pull image from local registry
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1
image: {{ local_registry }}/k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
args:
- "--v=2"
- "--timeout=300s"

4
playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-podsecuritypolicy.yaml.j2
View File

@@ -1,6 +1,4 @@
apiVersion: policy/v1beta1
# Remove pod security policies at k8s 1.25
apiVersion: policy/v1
kind: PodSecurityPolicy
metadata:
name: tridentpods