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

initContainer Resource Block: Fix #295 for merging #316

Merged
merged 2 commits into from Mar 6, 2024

Conversation

SgtCoDFish
Copy link
Member

This PR fixes #295 so we can merge it ahead of a release. I cherry-picked the commit from #295 so that @niklastanner would still get credit for their contribution.

Since I want to release soon, I'm cherry-picking and fixing in my own PR so that we can move quickly!

ner and others added 2 commits March 6, 2024 15:08
…s Tanner <niklas.tanner@hotmail.com>

Signed-off-by: ner <Niklas.Tanner@ti8m.ch>
Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
@jetstack-bot jetstack-bot added dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 6, 2024
@ThatsMrTalbot
Copy link
Contributor

/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2024
@SgtCoDFish
Copy link
Member Author

/approve

@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SgtCoDFish

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jetstack-bot jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 6, 2024
@jetstack-bot jetstack-bot merged commit 31fff85 into cert-manager:main Mar 6, 2024
4 checks passed
@SgtCoDFish SgtCoDFish deleted the initresource branch March 6, 2024 15:34
Copy link
Member

@wallrj wallrj left a comment

Choose a reason for hiding this comment

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

I tested it locally and it seems to work:

$ kubectl describe pod trust-manager-54c7cdf496-qlnjl
Name:             trust-manager-54c7cdf496-qlnjl
Namespace:        default
Priority:         0
Service Account:  trust-manager
Node:             kind-control-plane/172.18.0.2
Start Time:       Wed, 06 Mar 2024 15:25:29 +0000
Labels:           app=trust-manager
                  app.kubernetes.io/instance=tm
                  app.kubernetes.io/managed-by=Helm
                  app.kubernetes.io/name=trust-manager
                  app.kubernetes.io/version=v0.8.0
                  helm.sh/chart=trust-manager-v0.8.0
                  pod-template-hash=54c7cdf496
Annotations:      <none>
Status:           Pending
IP:
IPs:              <none>
Controlled By:    ReplicaSet/trust-manager-54c7cdf496
Init Containers:
  cert-manager-package-debian:
    Container ID:
    Image:           quay.io/jetstack/cert-manager-package-debian:20210119.0
    Image ID:
    Port:            <none>
    Host Port:       <none>
    SeccompProfile:  RuntimeDefault
    Args:
      /copyandmaybepause
      /debian-package
      /packages
    State:          Waiting
      Reason:       PodInitializing
    Ready:          False
    Restart Count:  0
    Limits:
      cpu:     100m
      memory:  128Mi
    Requests:
      cpu:        100m
      memory:     128Mi
    Environment:  <none>
    Mounts:
      /packages from packages (rw)
      /var/run/secrets/kubernetes.io/serviceaccount from kube-api-access-nw5h7 (ro)

/lgtm
/approve

@@ -53,6 +53,17 @@ image:
defaultPackage:
# Whether to load the default trust package during pod initialization, and include it in main container args. This container enables the 'useDefaultCAs' source on Bundles.
enabled: true
# Kubernetes pod resource limits for default package init container.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# Kubernetes pod resource limits for default package init container.
# Kubernetes Pod resource requests and limits for the default trust package init container.

The original text matches the documentation for the existing resources value, so happy if you prefer to keep it as-is for consistency

# Kubernetes pod resource limits for trust.
#
# For example:
# resources:
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
resources: {}

@wallrj
Copy link
Member

wallrj commented Mar 6, 2024

Ah, too late!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants