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

Revert "config: update replace names to match builder" #9696

Merged
merged 1 commit into from Jun 16, 2020

Conversation

tnozicka
Copy link
Contributor

Reverts #9674

Image replacement is using exact string match against the dockerfile so those configs were injecting 1.13 golang instead of registry.svc.ci.openshift.org/ocp/builder:golang-1.12 in the Dockerfiles. When those don't match, Dockefile line wins so Dockefiles must be updated first. By changing the replacment to registry.svc.ci.openshift.org/ocp/builder:golang-1.13 without corresponding change to the Dockerfile first this is switching the builds back to use golang 1.12 where is was previously on 1.13. Those that already rely on the new version or enforce a version got borked.

/assign @stevekuznetsov

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stevekuznetsov, tnozicka

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2020
@openshift-merge-robot openshift-merge-robot merged commit c1a1c11 into master Jun 16, 2020
@openshift-ci-robot
Copy link
Contributor

@tnozicka: Updated the following 6 configmaps:

  • ci-operator-master-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-priv-cluster-config-operator-master.yaml using file ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-master.yaml
    • key openshift-priv-oc-master.yaml using file ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml
    • key openshift-priv-origin-master.yaml using file ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml
    • key openshift-ci-tools-master.yaml using file ci-operator/config/openshift/ci-tools/openshift-ci-tools-master.yaml
    • key openshift-cluster-config-operator-master.yaml using file ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-master.yaml
    • key openshift-oc-master.yaml using file ci-operator/config/openshift/oc/openshift-oc-master.yaml
    • key openshift-origin-master.yaml using file ci-operator/config/openshift/origin/openshift-origin-master.yaml
  • ci-operator-4.4-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-priv-cluster-config-operator-release-4.4.yaml using file ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.4.yaml
    • key openshift-priv-cluster-policy-controller-release-4.4.yaml using file ci-operator/config/openshift-priv/cluster-policy-controller/openshift-priv-cluster-policy-controller-release-4.4.yaml
    • key openshift-priv-oc-release-4.4.yaml using file ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.4.yaml
    • key openshift-priv-openshift-controller-manager-release-4.4.yaml using file ci-operator/config/openshift-priv/openshift-controller-manager/openshift-priv-openshift-controller-manager-release-4.4.yaml
    • key openshift-priv-origin-release-4.4.yaml using file ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.4.yaml
    • key openshift-cluster-config-operator-release-4.4.yaml using file ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.4.yaml
    • key openshift-cluster-policy-controller-release-4.4.yaml using file ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.4.yaml
    • key openshift-oc-release-4.4.yaml using file ci-operator/config/openshift/oc/openshift-oc-release-4.4.yaml
    • key openshift-openshift-controller-manager-release-4.4.yaml using file ci-operator/config/openshift/openshift-controller-manager/openshift-openshift-controller-manager-release-4.4.yaml
    • key openshift-origin-release-4.4.yaml using file ci-operator/config/openshift/origin/openshift-origin-release-4.4.yaml
  • ci-operator-4.5-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-priv-cluster-config-operator-release-4.5.yaml using file ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.5.yaml
    • key openshift-priv-cluster-policy-controller-release-4.5.yaml using file ci-operator/config/openshift-priv/cluster-policy-controller/openshift-priv-cluster-policy-controller-release-4.5.yaml
    • key openshift-priv-oc-release-4.5.yaml using file ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.5.yaml
    • key openshift-priv-openshift-apiserver-release-4.5.yaml using file ci-operator/config/openshift-priv/openshift-apiserver/openshift-priv-openshift-apiserver-release-4.5.yaml
    • key openshift-priv-origin-release-4.5.yaml using file ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.5.yaml
    • key openshift-cluster-config-operator-release-4.5.yaml using file ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.5.yaml
    • key openshift-cluster-policy-controller-release-4.5.yaml using file ci-operator/config/openshift/cluster-policy-controller/openshift-cluster-policy-controller-release-4.5.yaml
    • key openshift-oc-release-4.5.yaml using file ci-operator/config/openshift/oc/openshift-oc-release-4.5.yaml
    • key openshift-openshift-apiserver-release-4.5.yaml using file ci-operator/config/openshift/openshift-apiserver/openshift-openshift-apiserver-release-4.5.yaml
    • key openshift-origin-release-4.5.yaml using file ci-operator/config/openshift/origin/openshift-origin-release-4.5.yaml
  • ci-operator-4.6-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-priv-cluster-config-operator-release-4.6.yaml using file ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.6.yaml
    • key openshift-priv-oc-release-4.6.yaml using file ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.6.yaml
    • key openshift-priv-origin-release-4.6.yaml using file ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.6.yaml
    • key openshift-cluster-config-operator-release-4.6.yaml using file ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.6.yaml
    • key openshift-oc-release-4.6.yaml using file ci-operator/config/openshift/oc/openshift-oc-release-4.6.yaml
    • key openshift-origin-release-4.6.yaml using file ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml
  • ci-operator-4.7-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-priv-cluster-config-operator-release-4.7.yaml using file ci-operator/config/openshift-priv/cluster-config-operator/openshift-priv-cluster-config-operator-release-4.7.yaml
    • key openshift-priv-oc-release-4.7.yaml using file ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.7.yaml
    • key openshift-priv-origin-release-4.7.yaml using file ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.7.yaml
    • key openshift-cluster-config-operator-release-4.7.yaml using file ci-operator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-release-4.7.yaml
    • key openshift-oc-release-4.7.yaml using file ci-operator/config/openshift/oc/openshift-oc-release-4.7.yaml
    • key openshift-origin-release-4.7.yaml using file ci-operator/config/openshift/origin/openshift-origin-release-4.7.yaml
  • ci-operator-misc-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-priv-kubernetes-marun-testing.yaml using file ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-marun-testing.yaml
    • key openshift-kubernetes-marun-testing.yaml using file ci-operator/config/openshift/kubernetes/openshift-kubernetes-marun-testing.yaml

In response to this:

Reverts #9674

Image replacement is using exact string match against the dockerfile so those configs were injecting 1.13 golang instead of registry.svc.ci.openshift.org/ocp/builder:golang-1.12 in the Dockerfiles. When those don't match, Dockefile line wins so Dockefiles must be updated first. By changing the replacment to registry.svc.ci.openshift.org/ocp/builder:golang-1.13 without corresponding change to the Dockerfile first this is switching the builds back to use golang 1.12 where is was previously on 1.13. Those that already rely on the new version or enforce a version got borked.

/assign @stevekuznetsov

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.

@tnozicka tnozicka deleted the revert-9674-skuznets/update-configs branch June 17, 2020 06:54
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
4 participants