Bug 1912888: Add recycler pod template as a ConfigMap #488

bertinatto · 2020-12-14T20:56:22Z

Reverts a45783f. This relied on a template file created by MCO, which updates after KCMO
Creates a ConfigMap with the recycler template in it
Projects the ConfigMap as a file to be used by the KCM pod
Passes the projected template file to KCM as an extended arg

sjenning · 2020-12-15T14:38:12Z

manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml

-          value: quay.io/openshift/origin-cluster-policy-controller:v4.3
+          value: quay.io/openshift/origin-cluster-policy-controller:latest
+        - name: TOOLS_IMAGE
+          value: quay.io/openshift/origin-tools:latest


This value is a placeholder for replacement mapped by https://github.com/openshift/cluster-kube-controller-manager-operator/blob/master/manifests/image-references. We need to add the tools image to that ImageStream (and revert all the other changes to existing image values in this file, I assume were for testing)

deads2k · 2020-12-15T14:40:07Z

bindata/bootkube/config/bootstrap-config-overrides.yaml

@@ -21,7 +21,3 @@ extendedArguments:
  service-cluster-ip-range: {{range .ServiceClusterIPRange}}
  - {{.}}{{end}}
  {{end}}
-  pv-recycler-pod-template-filepath-nfs: # bootstrap KCM doesn't need recycler templates


why is this assumption no longer valid? If it isn't, you'll need to render out the results.

I think it doesn't need it (the upstream template is used instead), but it's no harm if it has it

hm, the file isn't available during bootstrap, so it fails indeed. Removed

deads2k · 2020-12-15T14:40:54Z

bindata/v4.1.0/kube-controller-manager/pod.yaml

@@ -30,16 +30,16 @@ spec:
            --authentication-kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/controller-manager-kubeconfig/kubeconfig \
            --authorization-kubeconfig=/etc/kubernetes/static-pod-resources/configmaps/controller-manager-kubeconfig/kubeconfig \
            --client-ca-file=/etc/kubernetes/static-pod-certs/configmaps/client-ca/ca-bundle.crt \
-            --requestheader-client-ca-file=/etc/kubernetes/static-pod-certs/configmaps/aggregator-client-ca/ca-bundle.crt
+            --requestheader-client-ca-file=/etc/kubernetes/static-pod-certs/configmaps/aggregator-client-ca/ca-bundle.crt \
+            --pv-recycler-pod-template-filepath-hostpath=/etc/kubernetes/static-pod-resources/configmaps/kube-controller-manager-recycler-config/recycler-pod.yaml \


@soltysh your call. I don't feel strongly about a move here versus the extended args. But half and half seems not-awsome.

moved to extended args

👍 for extended args

deads2k · 2020-12-15T14:41:57Z

bindata/v4.1.0/kube-controller-manager/recycler-cm.yaml

+  namespace: openshift-kube-controller-manager
+  name: kube-controller-manager-recycler-config
+data:
+  recycler-pod.yaml:


please directly embed your yaml here. Then you can simply create this configmap.

bertinatto · 2020-12-15T15:02:36Z

bindata/v4.1.0/kube-controller-manager/recycler-cm.yaml

+  namespace: openshift-kube-controller-manager
+  name: kube-controller-manager-recycler-config
+data:
+  recycler-pod.yaml:


bertinatto · 2020-12-15T15:02:44Z

manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml

-          value: quay.io/openshift/origin-cluster-policy-controller:v4.3
+          value: quay.io/openshift/origin-cluster-policy-controller:latest
+        - name: TOOLS_IMAGE
+          value: quay.io/openshift/origin-tools:latest


bertinatto · 2020-12-15T15:07:10Z

bindata/bootkube/config/bootstrap-config-overrides.yaml

@@ -21,7 +21,3 @@ extendedArguments:
  service-cluster-ip-range: {{range .ServiceClusterIPRange}}
  - {{.}}{{end}}
  {{end}}
-  pv-recycler-pod-template-filepath-nfs: # bootstrap KCM doesn't need recycler templates


I think it doesn't need it (the upstream template is used instead), but it's no harm if it has it

bertinatto · 2020-12-15T16:57:39Z

manifests/image-references

+  - name: tools
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-tools:latest


is there any harm in using latest instead of pinning a version?

the release image building process will replace this image pull path with the tools image from that particular release

This reverts commit a45783f.

bertinatto · 2020-12-15T22:33:44Z

/test e2e-aws

bertinatto · 2020-12-15T22:39:16Z

/hold cancel

sjenning · 2020-12-16T04:20:29Z

/retest

pkg/operator/v411_00_assets/bindata.go

deads2k · 2020-12-16T19:49:40Z

bindata/v4.1.0/config/defaultconfig.yaml

@@ -12,9 +12,9 @@ extendedArguments:
  flex-volume-plugin-dir:
  - "/etc/kubernetes/kubelet-plugins/volume/exec" # created by machine-config-operator, owned by storage team/hekumar@redhat.com
  pv-recycler-pod-template-filepath-nfs:
-  - "/etc/kubernetes/manifests/recycler-pod.yaml" # created by machine-config-operator, owned by storage team/fbertina@redhat.com
+  - "/etc/kubernetes/static-pod-resources/configmaps/recycler-config/recycler-pod.yaml"


keep a storage team indication and name here.

deads2k · 2020-12-16T19:50:03Z

manifests/image-references

@@ -14,3 +14,7 @@ spec:
    from:
      kind: DockerImage
      name: quay.io/openshift/origin-cluster-policy-controller:v4.3
+  - name: tools


keep a storage team indication and name here.

deads2k · 2020-12-16T19:50:08Z

pkg/operator/targetconfigcontroller/targetconfigcontroller.go

@@ -404,6 +410,17 @@ func manageControllerManagerKubeconfig(ctx context.Context, client corev1client.
 	return resourceapply.ApplyConfigMap(client, recorder, requiredCM)
 }

+func manageRecycler(ctx context.Context, configMapsGetter corev1client.ConfigMapsGetter, recorder events.Recorder, imagePullSpec string) (*corev1.ConfigMap, bool, error) {


keep a storage team indication and name here.

openshift-ci-robot · 2021-01-05T14:13:32Z

@bertinatto: This pull request references Bugzilla bug 1912888, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1912888: Add recycler pod template as a ConfigMap

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.

openshift-ci-robot · 2021-01-05T14:25:51Z

@bertinatto: This pull request references Bugzilla bug 1896226, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1896226: Add recycler pod template as a ConfigMap

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.

openshift-ci-robot · 2021-01-05T14:27:37Z

@bertinatto: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

Add recycler pod template as a ConfigMap

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.

openshift-ci-robot · 2021-01-05T16:06:33Z

@bertinatto: This pull request references Bugzilla bug 1912888, which is invalid:

expected the bug to target the "4.7.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1912888: Add recycler pod template as a ConfigMap

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.

bertinatto · 2021-01-05T16:08:52Z

/bugzilla refresh

openshift-ci-robot · 2021-01-05T16:08:57Z

@bertinatto: This pull request references Bugzilla bug 1912888, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

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.

openshift-ci-robot · 2021-01-05T18:37:56Z

@bertinatto: All pull requests linked via external trackers have merged:

openshift/cluster-kube-controller-manager-operator#488

Bugzilla bug 1912888 has been moved to the MODIFIED state.

In response to this:

Bug 1912888: Add recycler pod template as a ConfigMap

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.

bertinatto · 2021-01-05T19:25:22Z

/cherry-pick 4.6

openshift-cherrypick-robot · 2021-01-05T19:25:28Z

@bertinatto: cannot checkout 4.6: error checking out 4.6: exit status 1. output: error: pathspec '4.6' did not match any file(s) known to git

In response to this:

/cherry-pick 4.6

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.

bertinatto · 2021-01-05T19:25:48Z

/cherry-pick release-4.6

openshift-cherrypick-robot · 2021-01-05T19:25:55Z

@bertinatto: new pull request created: #490

In response to this:

/cherry-pick release-4.6

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.

The template is no longer necessary in MCO because now it's embedded in KCM operator [0]. [0] openshift/cluster-kube-controller-manager-operator#488

openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Dec 14, 2020

openshift-ci-robot requested review from deads2k and sttts December 14, 2020 20:56

bertinatto force-pushed the fix-recycler branch 2 times, most recently from 7dc9c5c to e7fc332 Compare December 15, 2020 13:44

sjenning reviewed Dec 15, 2020

View reviewed changes

deads2k reviewed Dec 15, 2020

View reviewed changes

bertinatto force-pushed the fix-recycler branch 4 times, most recently from b08fec5 to 91f5c6d Compare December 15, 2020 18:45

bertinatto commented Dec 15, 2020

View reviewed changes

bertinatto changed the title ~~WIP: Embed template~~ Add recycler pod template as a ConfigMap Dec 15, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 15, 2020

Revert "Bug: 1805908: Don't use upstream recycler pod"

b77bf06

This reverts commit a45783f.

bertinatto force-pushed the fix-recycler branch 2 times, most recently from ce58a65 to 6ad7aa1 Compare December 15, 2020 19:54

bertinatto force-pushed the fix-recycler branch 2 times, most recently from 0c6d565 to 915a6e2 Compare December 15, 2020 22:36

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 15, 2020

deads2k reviewed Dec 16, 2020

View reviewed changes

pkg/operator/v411_00_assets/bindata.go Show resolved Hide resolved

deads2k reviewed Dec 16, 2020

View reviewed changes

openshift-ci-robot added bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 5, 2021

bertinatto changed the title ~~Bug 1912888: Add recycler pod template as a ConfigMap~~ Bug 1896226: Add recycler pod template as a ConfigMap Jan 5, 2021

openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. labels Jan 5, 2021

bertinatto changed the title ~~Bug 1896226: Add recycler pod template as a ConfigMap~~ Add recycler pod template as a ConfigMap Jan 5, 2021

openshift-ci-robot removed bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 5, 2021

bertinatto changed the title ~~Add recycler pod template as a ConfigMap~~ Bug 1912888: Add recycler pod template as a ConfigMap Jan 5, 2021

openshift-ci-robot added the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label Jan 5, 2021

openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jan 5, 2021

openshift-merge-robot merged commit fad506d into openshift:master Jan 5, 2021

openshift-cherrypick-robot mentioned this pull request Jan 5, 2021

[release-4.6] Bug 1913030: Add recycler pod template as a ConfigMap #490

Merged

Bug 1912888: Add recycler pod template as a ConfigMap #488

Bug 1912888: Add recycler pod template as a ConfigMap #488

Conversation

bertinatto commented Dec 14, 2020 • edited

sjenning Dec 15, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bertinatto Dec 15, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bertinatto Dec 15, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bertinatto commented Dec 15, 2020

bertinatto commented Dec 15, 2020

sjenning commented Dec 16, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jan 5, 2021

openshift-ci-robot commented Jan 5, 2021

openshift-ci-robot commented Jan 5, 2021

openshift-ci-robot commented Jan 5, 2021

bertinatto commented Jan 5, 2021

openshift-ci-robot commented Jan 5, 2021

openshift-ci-robot commented Jan 5, 2021

bertinatto commented Jan 5, 2021

openshift-cherrypick-robot commented Jan 5, 2021

bertinatto commented Jan 5, 2021

openshift-cherrypick-robot commented Jan 5, 2021

bertinatto commented Dec 14, 2020 •

edited

sjenning Dec 15, 2020 •

edited

bertinatto Dec 15, 2020 •

edited

bertinatto Dec 15, 2020 •

edited