add: specific selector for operator

[codekow]

Issue #, if available: #1632

Description of changes:

Improve label selection for service and deployment association with pods. When multiple operators are deployed you may get inconsistent results on the service.

Related s3-controller/pull/94

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[ack-bot]

Hi @codekow. Thanks for your PR.

I'm waiting for a aws-controllers-k8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

[codekow]

Addresses aws-controllers-k8s/community#1632

[codekow]

See https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels

Considering above, I have updated the minimal labels to get basic selection functionality without removing any existing labels.

[jaypipes]

One tiny request otherwise I dig it. :)

[jaypipes]

Also, one other thing, @codekow: we have corresponding Helm templates in templates/helm too.

[acornett21]

I'd like to see the deployment.label section of the CSV that's output for the S3 (or any other controller).

The below will generate a file at ..olm/bundle/manifests/ack-s3-controller.clusterserviceversion.yaml in the S3 controller.

export SERVICE=s3
ACK_GENERATE_OLM=true make build-controller SERVICE=$SERVICE

I don't think we have any post hocks to change this, but I'd like to be certain.

[jaypipes]

👍

[codekow]

export SERVICE=s3
ACK_GENERATE_OLM=true make build-controller SERVICE=$SERVICE

Checking ..olm/bundle/manifests/ack-s3-controller.clusterserviceversion.yaml...

spec:
  install:
    spec:
      deployments:
      - label:
          app.kubernetes.io/name: ack-s3-controller
          app.kubernetes.io/part-of: ack-system
          control-plane: controller
        name: ack-s3-controller
        spec:
          replicas: 1
          selector:
            matchLabels:
              app.kubernetes.io/name: ack-s3-controller
              control-plane: controller
          strategy: {}
          template:
            metadata:
              labels:
                app.kubernetes.io/name: ack-s3-controller
                control-plane: controller

[codekow]

FYI @acornett21 ^^

[codekow]

Do we want to leave the label: control-plane: controller?

@jaypipes @acornett21

[jaypipes]

Do we want to leave the label: control-plane: controller?

@jaypipes @acornett21

We don't need to, no. I put that on there originally when I copied some stuff from the node-termination-handler project. I think that label is no longer used by anything.

[acornett21]

Do we want to leave the label: control-plane: controller?

@jaypipes @acornett21

I pretty sure no project that's dependent on ACK in OpenShift uses this label, so I'm fine removing it as well.

[codekow]

@jaypipes @acornett21

Old label removed. I believe the merge is ready. Let me know if there is anything else to resolve with this PR.

Thanks for your help! 😄

[RedbackThomson]

@codekow I just reopened a comment regarding the namespace annotation. I know there was some disagreement, but I feel relatively strongly that it's not the right move for now. I'd also rather leave it off, and add it later, than have an annotation that we need to support for backward compatibility sake.

[codekow]

@jaypipes @a-hilaly @RedbackThomson

I believe all discussed items have been addressed. The PR should be ready to test.

[a-hilaly]

/ok-to-test

[a-hilaly]

++ Thank you @codekow !

[jaypipes]

Nice stuff here, let's get this merged! :)

[RedbackThomson]

Great. Thank you!
/lgtm

[ack-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: A-Hilaly, acornett21, codekow, jaypipes, RedbackThomson

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 [A-Hilaly,RedbackThomson]

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