Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/cncf-conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@ jobs:
sudo podman exec "${node}" systemctl disable firewalld || true
done

# Set default storage class for CNCF conformance tests
echo "Setting default storage class annotation..."
make env CMD="kubectl annotate storageclass topolvm-provisioner storageclass.kubernetes.io/is-default-class=true"

# Verify the annotation was applied
echo "Verifying default storage class:"
make env CMD="kubectl get storageclass topolvm-provisioner -o yaml | grep -A2 annotations"

- name: Run CNCF conformance tests with Sonobuoy
id: run-sonobuoy
shell: bash
Expand Down
1 change: 1 addition & 0 deletions src/topolvm/assets/02-topolvm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ kind: StorageClass
metadata:
name: topolvm-provisioner
annotations:
storageclass.kubernetes.io/is-default-class: "true"
labels:
helm.sh/chart: topolvm-15.5.2
app.kubernetes.io/name: topolvm
Expand Down
7 changes: 6 additions & 1 deletion src/topolvm/generate_manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ EOF
# Patch replicas to 1
# shellcheck disable=SC2016
yq 'select(.kind == "Deployment").spec.replicas = 1' -i "${ASSETS_DIR}/02-topolvm.yaml"


# Annotate topolvm-provisioner StorageClass as default
yq 'with(select(.kind == "StorageClass" and .metadata.name == "topolvm-provisioner");
.metadata.annotations."storageclass.kubernetes.io/is-default-class" = "true"
)' -i "${ASSETS_DIR}/02-topolvm.yaml"

# Patch topolvm-controller manifest with longer startup delay to allow dns to start
yq 'with(select(.kind == "Deployment" and .metadata.name == "topolvm-controller").spec.template.spec.containers[] | select(.name == "topolvm-controller");
.livenessProbe.failureThreshold = 3 |
Expand Down
Loading