Skip to content

Conversation

@jnewsome97
Copy link
Contributor

Summary

This PR improves the ocp4_workload_windows_node workload to support containerd runtime and UPI CloudFormation deployments.

Changes

MachineSet Configuration

  • Extract security groups and subnet from existing worker MachineSet instead of using hardcoded filters
  • Fixes deployment failures in UPI CloudFormation environments where default naming (e.g., cluster-id-worker-sg) doesn't exist

Container Runtime

  • Replace docker commands with crictl for containerd runtime compatibility
  • Installs and configures crictl on Windows nodes during image pre-pull
  • Aligns with current OpenShift container runtime standards

Reliability Improvements

  • Add Windows node readiness check before proceeding with subsequent tasks
  • Delete existing image pull job if present to allow node replacement

NetCandyStore Update

  • Update helm chart from v1.0.1 to v1.0.2
  • Removes DeploymentConfig deprecation warnings

Testing

These changes have been tested and resolve deployment issues in UPI environments while maintaining compatibility with IPI deployments.

Files Changed

  • ansible/roles_ocp_workloads/ocp4_workload_windows_node/tasks/workload.yml
  • ansible/roles_ocp_workloads/ocp4_workload_windows_node/templates/windows-ms.j2
  • ansible/roles_ocp_workloads/ocp4_workload_windows_node/templates/job-image-pull.j2
  • ansible/roles_ocp_workloads/ocp4_workload_windows_node/files/netcandystore-1.0.2.tgz (new)
  • ansible/roles_ocp_workloads/ocp4_workload_windows_node/files/netcandystore-1.0.1.tgz (removed)

Changes to ocp4_workload_windows_node:

- Extract security groups and subnet from existing worker MachineSet instead of using hardcoded filters
  This fixes deployment failures in UPI CloudFormation environments where the default naming doesn't match

- Add Windows node readiness check before proceeding with subsequent tasks

- Allow node replacement by deleting existing image pull job if present

- Replace docker commands with crictl for containerd runtime compatibility
  Installs and configures crictl on Windows nodes to align with current OpenShift container runtime

- Update NetCandyStore helm chart from v1.0.1 to v1.0.2
  Removes DeploymentConfig deprecation warnings

These changes resolve deployment issues and modernize the Windows node workload for current OpenShift versions.
Copy link
Contributor

@hararora123 hararora123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hararora123 hararora123 merged commit 39fb72d into redhat-cop:development Dec 19, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants