Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicate fluentbitagent toleartions #5061

Open
wants to merge 4 commits into
base: dev-v2.11
Choose a base branch
from

Conversation

skanakal
Copy link
Contributor

Pull Requests Rules

  • Never remove an already released chart!

    • This does not apply to RC's because they are not released.
  • Each Pull Request should only modify one chart with its dependencies.

  • Pull request title:

    [dev-v2.X] <chart> <version> <action>
    
    • <action>: 1 of (bump; remove; UnRC)

Checkpoints for Chart Bumps

release.yaml:

  • Each chart version in release.yaml DOES NOT modify an already released chart. If so, stop and modify the versions so that it releases a net-new chart.
  • Each chart version in release.yaml IS exactly 1 more patch or minor version than the last released chart version. If not, stop and modify the versions so that it releases a net-new chart.

Chart.yaml and index.yaml:

  • The index.yaml file has an entry for your new chart version.
  • The index.yaml entries for each chart matches the Chart.yaml for each chart.
  • Each chart has ALL required annotations
    • kube-version annotation
    • rancher-version annotation
    • permits-os annotation (indicates Windows and/or Linux)

Fill the following only if required by your manager.

Issue:

rancher/rancher#48917

Solution

set the tolerations based on the kubernetes distribution

QA Testing Considerations

Already mentioned in the above issue

@skanakal skanakal requested a review from a team as a code owner January 31, 2025 05:48
Copy link

Validation steps

  • Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.
  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913
  
  • Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
  • Approve the PR to run the CI check.

Copy link

Validation steps

  • Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.
  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913
  
  • Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
  • Approve the PR to run the CI check.

Copy link

github-actions bot commented Feb 3, 2025

Validation steps

  • Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.
  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913
  
  • Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
  • Approve the PR to run the CI check.

{{- if $isRKE2orK3S }}
{{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/control-plane" "operator" "Exists" "effect" "NoSchedule") -}}
{{- else }}
{{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/controlplane" "operator" "Exists" "effect" "NoSchedule") -}}
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't just include RKE1, but EKS and GKE deployments as well, but I don't know off the top of my head if this affects those types of deployments

Copy link
Contributor Author

@skanakal skanakal Feb 4, 2025

Choose a reason for hiding this comment

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

yeah that does as the DS managed by fluentbitagent... I have now modified the logic, and I believe it will now reflect the current behavior—using "control-plane" for the rest of the kubernetes distribution. only, thing extra "controlplane" for rke based clusters.

Copy link

github-actions bot commented Feb 4, 2025

Validation steps

  • Ensure all container images have repository and tag on the same level to ensure that all container images are included in rancher-images.txt which are used by airgap customers.
  Ex:-
    longhorn-controller:
      repository: rancher/hardened-sriov-cni
      tag: v2.6.3-build20230913
  
  • Add a 👍 (thumbs up) reaction to this comment once done. CI won't pass without this reaction to the github-action bot's latest validation comment.
  • Approve the PR to run the CI check.

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