Helm: Add revision history limit for master replica

[omerap12]

Fixes: #1759

Tested locally. Output:

---
# Source: node-feature-discovery/templates/master.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
  name:  release-name-node-feature-discovery-master
  namespace: default
  labels:
    helm.sh/chart: node-feature-discovery-0.2.1
    app.kubernetes.io/name: node-feature-discovery
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "master"
    app.kubernetes.io/managed-by: Helm
    role: master
spec:
  replicas: 1
  revisionHistoryLimit: 3
  selector:
    matchLabels:
      app.kubernetes.io/name: node-feature-discovery
      app.kubernetes.io/instance: release-name
      role: master
  template:
    metadata:
      labels:
        app.kubernetes.io/name: node-feature-discovery
        app.kubernetes.io/instance: release-name
        role: master
    spec:
      serviceAccountName: release-name-node-feature-discovery
      enableServiceLinks: false
      securityContext:
        {}
      containers:
        - name: master
          securityContext:
            allowPrivilegeEscalation: false
            capabilities:
              drop:
              - ALL
            readOnlyRootFilesystem: true
            runAsNonRoot: true
          image: "gcr.io/k8s-staging-nfd/node-feature-discovery:master"
          imagePullPolicy: Always
          livenessProbe:
            grpc:
              port: 8082
            initialDelaySeconds: 10
            periodSeconds: 10
          readinessProbe:
            grpc:
              port: 8082
            initialDelaySeconds: 5
            periodSeconds: 10
            failureThreshold: 10
          ports:
          - containerPort: 8080
            name: grpc
          - containerPort: 8081
            name: metrics
          env:
          - name: NODE_NAME
            valueFrom:
              fieldRef:
                fieldPath: spec.nodeName
          command:
            - "nfd-master"
          resources:
            limits:
              memory: 4Gi
            requests:
              cpu: 100m
              memory: 128Mi
          args:
            ## By default, disable crd controller for other than the default instances
            - "-crd-controller=true"
            # Go over featureGates and add the feature-gate flag
            - "-feature-gates=NodeFeatureAPI=true"
            - "-feature-gates=NodeFeatureGroupAPI=false"
            - "-metrics=8081"
          volumeMounts:
            - name: nfd-master-conf
              mountPath: "/etc/kubernetes/node-feature-discovery"
              readOnly: true
      volumes:
        - name: nfd-master-conf
          configMap:
            name: release-name-node-feature-discovery-master-conf
            items:
              - key: nfd-master.conf
                path: nfd-master.conf
      affinity:
        nodeAffinity:
          preferredDuringSchedulingIgnoredDuringExecution:
          - preference:
              matchExpressions:
              - key: node-role.kubernetes.io/master
                operator: In
                values:
                - ""
            weight: 1
          - preference:
              matchExpressions:
              - key: node-role.kubernetes.io/control-plane
                operator: In
                values:
                - ""
            weight: 1
      tolerations:
        - effect: NoSchedule
          key: node-role.kubernetes.io/master
          operator: Equal
          value: ""
        - effect: NoSchedule
          key: node-role.kubernetes.io/control-plane
          operator: Equal
          value: ""

[netlify]

✅ Deploy Preview for kubernetes-sigs-nfd ready!

Name	Link
🔨 Latest commit	920306c
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-nfd/deploys/669149d2dd52a8000858dc11
😎 Deploy Preview	https://deploy-preview-1782--kubernetes-sigs-nfd.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[marquiz]

Thanks @omerap12 for the contribution!

For the sake of consistency, I think we should add this parameter to nfd-gc, too (templates/nfd-gc.yaml, gc.revisionHistoryLimit in values). Also, we need to document the new parameter(s) in docs/deployment/helm.md.

[omerap12]

Thanks @omerap12 for the contribution!

For the sake of consistency, I think we should add this parameter to nfd-gc, too (templates/nfd-gc.yaml, gc.revisionHistoryLimit in values). Also, we need to document the new parameter(s) in docs/deployment/helm.md.

sure. adding

[omerap12]

fixed @TessaIO

[omerap12]

Friendly reminder :) @marquiz

[marquiz]

Looks good, now 👍

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marquiz, omerap12, TessaIO

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:

• OWNERS [marquiz]

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

[marquiz]

/assign @TessaIO

[k8s-ci-robot]

@AhmedThresh: changing LGTM is restricted to collaborators

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[TessaIO]

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 9f11225ec91e940defb754615380867aed0646c4

[marquiz]

@ArangoGutierrez @TessaIO maybe we should consider cherry-picking this to v0.16.3. It's such a tiny change even if not strictly a bug fix, WDYT?

[TessaIO]

no objections, we can go with that

[marquiz]

/cherry-pick release-0.16

[k8s-infra-cherrypick-robot]

@marquiz: #1782 failed to apply on top of branch "release-0.16":

Applying: Add revision history limit for master replica and for garbage collector
.git/rebase-apply/patch:40: trailing whitespace.
  
.git/rebase-apply/patch:42: trailing whitespace.
  revisionHistoryLimit: 
.git/rebase-apply/patch:51: trailing whitespace.
  revisionHistoryLimit: 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	deployment/helm/node-feature-discovery/templates/master.yaml
M	deployment/helm/node-feature-discovery/templates/nfd-gc.yaml
M	deployment/helm/node-feature-discovery/values.yaml
M	docs/deployment/helm.md
Falling back to patching base and 3-way merge...
Auto-merging docs/deployment/helm.md
CONFLICT (content): Merge conflict in docs/deployment/helm.md
Auto-merging deployment/helm/node-feature-discovery/values.yaml
Auto-merging deployment/helm/node-feature-discovery/templates/nfd-gc.yaml
Auto-merging deployment/helm/node-feature-discovery/templates/master.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add revision history limit for master replica and for garbage collector
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[rouke-broersma]

@omerap12 is there a specific reason you didn't add the field for the daemonset? I think the same applies, no?

[omerap12]

@omerap12 is there a specific reason you didn't add the field for the daemonset? I think the same applies, no?

Hey, no good reason. I can raise another PR to add this field to the daemon set as well if you'd like :)

[rouke-broersma]

Already done :)