OCPBUGS-13968: Merge 1.11.1 #94

gcs278 · 2023-08-16T03:22:20Z

Rebased to CoreDNS 1.11.1

Replaces #93 due to coredns#6255 requiring a revert and a version bump.

I made this PR using the same process as #88, #76, #73, #52, #60, and #70:

git remote update
git checkout v1.11.1
git checkout -b merge-1.11.1-tmp
git checkout origin/master
echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b
git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b
git checkout merge-1.11.1
git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88
My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:

git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS

I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):

53e672268 UPSTREAM: <carry>: openshift: Add OWNERS

I squashed/merged the following commit into the existing "Add product build config" commit:

2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml

I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:

48a49554b OCPBUGS-12494: Address CVE-2022-41723

No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).

Signed-off-by: Fish-pro <[email protected]>

…coredns#5921) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.194 to 1.44.199. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.194...v1.44.199) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dns#5919) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.9.0 to 0.9.1. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@cff3e9a...8bd2f9f) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.1 to 2.2.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@3ebbd71...17573ee) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](golang/sys@v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ns#5922) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.52.3 to 1.53.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.52.3...v1.53.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Signed-off-by: Fish-pro <[email protected]>

Don't lock weights for duration of parsing weight file. Add missing check to reject zero weight values. Signed-off-by: Gabor Dozsa <[email protected]>

Signed-off-by: Lionello Lunesu <[email protected]>

Signed-off-by: Chris O'Haver <[email protected]>

…coredns#5927)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](golang/net@v0.5.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…oredns#5926) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.39.0 to 0.40.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.39.0...v0.40.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dmachard <[email protected]>

….0 (coredns#5935)

)

This change avoids the hard coding of HTTPS, allowing flexibility in whether HTTP or HTTPS is used. Signed-off-by: Sebastian Dahlgren <[email protected]>

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/golang/crypto/releases) - [Commits](golang/crypto@v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.26.1 to 0.26.2. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](kubernetes/api@v0.26.1...v0.26.2) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…coredns#5948) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.209 to 1.44.214. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.209...v1.44.214) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dns#5960) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.110.0 to 0.112.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](googleapis/google-api-go-client@v0.110.0...v0.112.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…oredns#5961) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.40.0 to 0.42.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.40.0...v0.42.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dns#5962) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.9.1 to 0.9.2. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@8bd2f9f...1f0aa58) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@32dc499...16964e9) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

openshift-ci · 2023-08-16T05:58:39Z

@gcs278: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-metal-ipi-ovn	`5378301`	link	false	`/test e2e-metal-ipi-ovn`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

Miciah · 2023-08-16T15:20:30Z

/approve
/hold
We'll run payload tests, and if the payload tests do not turn up any problems, we can cancel the hold, merge CoreDNS 1.11.1 in OpenShift 4.15, and then backport to 4.14.0 in the next week or so.

openshift-ci · 2023-08-16T15:30:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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~~ [Miciah]

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

gcs278 · 2023-08-16T17:33:22Z

/payload ?

gcs278 · 2023-08-17T16:34:03Z

Forgot to start payload test:
/payload 4.14 nightly blocking

openshift-ci · 2023-08-17T16:34:13Z

@gcs278: trigger 8 job(s) of type blocking for the nightly release of OCP 4.14

periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-sdn-upgrade
periodic-ci-openshift-release-master-ci-4.14-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-rt-upgrade
periodic-ci-openshift-hypershift-release-4.14-periodics-e2e-aws-ovn-conformance
periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-ovn-serial
periodic-ci-openshift-release-master-ci-4.14-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6
periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e0a90a50-3d1b-11ee-8dce-d90816b4dc03-0

gcs278 · 2023-08-24T19:15:02Z

: [sig-autoscaling] [Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) CustomResourceDefinition Should scale with a CRD targetRef [Suite:openshift/conformance/parallel] [Suite:k8s] : Not related
/test e2e-aws-ovn

: [sig-autoscaling] [Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) CustomResourceDefinition Should scale with a CRD targetRef [Suite:openshift/conformance/parallel] [Suite:k8s] : Not related
/test e2e-gcp-sdn-serial

: [sig-autoscaling] [Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) CustomResourceDefinition Should scale with a CRD targetRef [Suite:openshift/conformance/parallel] [Suite:k8s] : Not related
/test e2e-metal-ipi-ovn

gcs278 · 2023-08-24T19:19:58Z

Payload Results 5 pass 3 fails. Looks good, no indication DNS is an issue.

periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-ovn-serial: bcd5c973-7860-47e1-b6d5-d03048d7dcc0: Cluster install fail
periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6: 7038bff2-4985-454f-b83f-abe7dac29ddf: Cluster install fail
periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm: cf333ff6-c190-418e-aff7-50ba35d4d5e4: Cluster install fail

Retrying the cluster install failed jobs:

/payload-job periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-ovn-serial
/payload-job periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6
/payload-job periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

openshift-ci · 2023-08-24T19:20:03Z

@gcs278: trigger 3 job(s) for the /payload-(job|aggregate) command

periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-ovn-serial
periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6
periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/370cd0b0-42b3-11ee-9a0a-4358508d60b3-0

gcs278 · 2023-08-25T18:29:59Z

Payload round 2 results:
periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-ovn-serial and periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6 passed.

periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm failed due to cluster creation.

I'll try one last time, but generally everything looks great.
/payload-job periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

openshift-ci · 2023-08-25T18:30:08Z

@gcs278: trigger 1 job(s) for the /payload-(job|aggregate) command

periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/65f0ab50-4375-11ee-8dbe-1006e22b9272-0

ShudiLi · 2023-08-28T02:21:38Z

Tested it with 4.14.0-0.ci.test-2023-08-28-011455-ci-ln-g68q1p2-latest

`
1.
% oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.14.0-0.ci.test-2023-08-28-011455-ci-ln-g68q1p2-latest True False 25m Cluster version is 4.14.0-0.ci.test-2023-08-28-011455-ci-ln-g68q1p2-latest
%

% oc -n openshift-dns rsh dns-default-2bzg5
sh-4.4# coredns -version
CoreDNS-1.11.1
linux/amd64, go1.20.3,
sh-4.4#

% go version -m coredns
coredns: go1.20.3
path github.com/coredns/coredns
mod github.com/coredns/coredns (devel)
dep cloud.google.com/go/compute/metadata v0.2.3
dep github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
dep github.com/Azure/go-autorest/autorest v0.11.29
dep github.com/Azure/go-autorest/autorest/adal v0.9.22
dep github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
dep github.com/Azure/go-autorest/autorest/azure/cli v0.4.5
dep github.com/Azure/go-autorest/autorest/date v0.3.0
dep github.com/Azure/go-autorest/autorest/to v0.2.0
dep github.com/Azure/go-autorest/logger v0.2.1
dep github.com/Azure/go-autorest/tracing v0.6.0
dep github.com/DataDog/datadog-agent/pkg/obfuscate v0.45.0-rc.1
dep github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-devel.0.20230725154044-2549ba9058df
dep github.com/DataDog/datadog-go/v5 v5.1.1
dep github.com/DataDog/go-tuf v1.0.1-0.5.2
dep github.com/DataDog/sketches-go v1.2.1
dep github.com/antonmedv/expr v1.13.0
dep github.com/apparentlymart/go-cidr v1.1.0
dep github.com/aws/aws-sdk-go v1.44.322
dep github.com/beorn7/perks v1.0.1
dep github.com/cespare/xxhash/v2 v2.2.0
dep github.com/coredns/caddy v1.1.1
dep github.com/coreos/go-semver v0.3.0
dep github.com/coreos/go-systemd/v22 v22.3.2
dep github.com/davecgh/go-spew v1.1.1
dep github.com/dimchansky/utfbom v1.1.1
dep github.com/dnstap/golang-dnstap v0.4.0
dep github.com/dustin/go-humanize v1.0.1
dep github.com/emicklei/go-restful/v3 v3.10.2
dep github.com/farsightsec/golang-framestream v0.3.0
dep github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568
dep github.com/go-logr/logr v1.2.4
dep github.com/go-openapi/jsonpointer v0.19.6
dep github.com/go-openapi/jsonreference v0.20.1
dep github.com/go-openapi/swag v0.22.3
dep github.com/gogo/protobuf v1.3.2
dep github.com/golang-jwt/jwt/v4 v4.5.0
dep github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
dep github.com/golang/protobuf v1.5.3
dep github.com/google/gnostic v0.5.7-v3refs
dep github.com/google/go-cmp v0.5.9
dep github.com/google/gofuzz v1.2.0
dep github.com/google/s2a-go v0.1.4
dep github.com/google/uuid v1.3.0
dep github.com/googleapis/enterprise-certificate-proxy v0.2.5
dep github.com/googleapis/gax-go/v2 v2.12.0
dep github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
dep github.com/imdario/mergo v0.3.12
dep github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9
dep github.com/jmespath/go-jmespath v0.4.0
dep github.com/josharian/intern v1.0.0
dep github.com/json-iterator/go v1.1.12
dep github.com/mailru/easyjson v0.7.7
dep github.com/matttproud/golang_protobuf_extensions v1.0.4
dep github.com/miekg/dns v1.1.55
dep github.com/mitchellh/go-homedir v1.1.0
dep github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
dep github.com/modern-go/reflect2 v1.0.2
dep github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
dep github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492
dep github.com/opentracing/opentracing-go v1.2.0
dep github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0
dep github.com/openzipkin/zipkin-go v0.4.2
dep github.com/oschwald/geoip2-golang v1.9.0
dep github.com/oschwald/maxminddb-golang v1.11.0
dep github.com/outcaste-io/ristretto v0.2.1
dep github.com/philhofer/fwd v1.1.2
dep github.com/pkg/errors v0.9.1
dep github.com/prometheus/client_golang v1.16.0
dep github.com/prometheus/client_model v0.4.0
dep github.com/prometheus/common v0.44.0
dep github.com/prometheus/procfs v0.10.1
dep github.com/quic-go/qtls-go1-20 v0.3.1
dep github.com/quic-go/quic-go v0.37.4
dep github.com/secure-systems-lab/go-securesystemslib v0.7.0
dep github.com/spf13/pflag v1.0.5
dep github.com/tinylib/msgp v1.1.8
dep go.etcd.io/etcd/api/v3 v3.5.9
dep go.etcd.io/etcd/client/pkg/v3 v3.5.9
dep go.etcd.io/etcd/client/v3 v3.5.9
dep go.opencensus.io v0.24.0
dep go.uber.org/atomic v1.11.0
dep go.uber.org/multierr v1.6.0
dep go.uber.org/zap v1.17.0
dep golang.org/x/crypto v0.12.0
dep golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
dep golang.org/x/net v0.14.0
dep golang.org/x/oauth2 v0.11.0
dep golang.org/x/sys v0.11.0
dep golang.org/x/term v0.11.0
dep golang.org/x/text v0.12.0
dep golang.org/x/time v0.3.0
dep golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
dep google.golang.org/api v0.136.0
dep google.golang.org/appengine v1.6.7
dep google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5
dep google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577
dep google.golang.org/grpc v1.57.0
dep google.golang.org/protobuf v1.31.0
dep gopkg.in/DataDog/dd-trace-go.v1 v1.54.0
dep gopkg.in/inf.v0 v0.9.1
dep gopkg.in/yaml.v2 v2.4.0
dep gopkg.in/yaml.v3 v3.0.1
dep k8s.io/api v0.27.4
dep k8s.io/apimachinery v0.27.4
dep k8s.io/client-go v0.27.4
dep k8s.io/klog/v2 v2.100.1
dep k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
dep k8s.io/utils v0.0.0-20230209194617-a36077c30491
dep sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
dep sigs.k8s.io/structured-merge-diff/v4 v4.2.3
dep sigs.k8s.io/yaml v1.3.0
build -buildmode=exe
build -compiler=gc
build CGO_ENABLED=1
build CGO_CFLAGS=
build CGO_CPPFLAGS=
build CGO_CXXFLAGS=
build CGO_LDFLAGS=
build GOARCH=amd64
build GOOS=linux
build GOAMD64=v1
build vcs=git
build vcs.revision=99eea928df51a70177e5ac753ce0b53c6946d6a1
build vcs.time=2023-05-03T12:53:56Z
build vcs.modified=true
%
`

/label qe-approved
thanks

gcs278 · 2023-09-12T16:46:01Z

Updated Deployment.apps/apiserver -n openshift-apiserver because it changed From: 20:57:10Z To: 20:57:11Z result=reject looks unrelated
/test e2e-gcp-sdn-serial

alebedev87 · 2023-09-13T15:15:26Z

/assign

alebedev87 · 2023-09-14T15:32:15Z

/lgtm

gcs278 · 2023-09-22T14:36:34Z

4.15 branch is open for development now, and the sooner we get this in, the sooner we can find out if something is wrong.
/unhold

openshift-ci-robot · 2023-09-22T16:39:00Z

/retest-required

Remaining retests: 0 against base HEAD dc6ac31 and 2 for PR HEAD 5378301 in total

gcs278 · 2023-09-22T18:10:03Z

cluster install failed:
/test e2e-gcp-sdn-serial

openshift-ci-robot · 2023-09-22T20:49:37Z

@gcs278: Jira Issue OCPBUGS-13968: All pull requests linked via external trackers have merged:

openshift/coredns#94

Jira Issue OCPBUGS-13968 has been moved to the MODIFIED state.

In response to this:

Rebased to CoreDNS 1.11.1

Replaces #93 due to coredns#6255 requiring a revert and a version bump.

I made this PR using the same process as #88, #76, #73, #52, #60, and #70:

git remote update

git checkout v1.11.1

git checkout -b merge-1.11.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b

git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b

git checkout merge-1.11.1

git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88

My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I squashed/merged the following commit into the existing "Add product build config" commit:
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:
48a49554b OCPBUGS-12494: Address CVE-2022-41723
No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).

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-merge-robot · 2023-09-27T15:50:04Z

Fix included in accepted release 4.15.0-0.nightly-2023-09-27-073353

Fish-pro and others added 30 commits February 9, 2023 12:29

Use http constants instead of string (coredns#5908)

039a4d8

Signed-off-by: Fish-pro <[email protected]>

fix typo for log output (coredns#5909)

1b001ec

Signed-off-by: Fish-pro <[email protected]>

Close the body after reading the response body information (coredns#5907

156da74

) Signed-off-by: Fish-pro <[email protected]>

plugin/loadbalance: Improve weights update (coredns#5906)

52f1c64

Don't lock weights for duration of parsing weight file. Add missing check to reject zero weight values. Signed-off-by: Gabor Dozsa <[email protected]>

build: cp Dockerfile in docker-build target (coredns#5925)

ad623eb

Signed-off-by: Lionello Lunesu <[email protected]>

send notifies after adding zones all zones (coredns#5774)

77c7c0b

Signed-off-by: Chris O'Haver <[email protected]>

build(deps): bump github.com/aws/aws-sdk-go from 1.44.199 to 1.44.204 (…

fa76615

…coredns#5927)

dnstap tls support (coredns#5917)

83fc3bb

Signed-off-by: dmachard <[email protected]>

build(deps): bump google.golang.org/api from 0.109.0 to 0.110.0 (core…

915b74f

…dns#5928)

build(deps): bump gopkg.in/DataDog/dd-trace-go.v1 from 1.47.0 to 1.48…

e82d8ed

….0 (coredns#5935)

build(deps): bump github.com/miekg/dns from 1.1.50 to 1.1.51 (coredns…

763b797

…#5936)

build(deps): bump github/codeql-action from 2.2.4 to 2.2.5 (coredns#5937

39b8f78

)

build(deps): bump github.com/aws/aws-sdk-go from 1.44.204 to 1.44.209 (…

2cf4b3d

…coredns#5939)

build(deps): bump golang.org/x/crypto (coredns#5941)

03bb228

build(deps): bump github.com/antonmedv/expr from 1.12.0 to 1.12.1 (co…

03fb2fa

…redns#5940)

DoH: Allow http as the protocol (coredns#5762)

80b40c1

This change avoids the hard coding of HTTPS, allowing flexibility in whether HTTP or HTTPS is used. Signed-off-by: Sebastian Dahlgren <[email protected]>

openshift-ci bot assigned Miciah and rfredette Aug 16, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 16, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2023

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Aug 28, 2023

openshift-ci bot assigned alebedev87 Sep 13, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 14, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 22, 2023

openshift-merge-robot merged commit ac051aa into openshift:master Sep 22, 2023

gcs278 mentioned this pull request May 9, 2024

NE-1721: Merge 1.11.3 #118

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-13968: Merge 1.11.1 #94

OCPBUGS-13968: Merge 1.11.1 #94

gcs278 commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023 •

edited

Loading

Miciah commented Aug 16, 2023 •

edited

Loading

openshift-ci bot commented Aug 16, 2023

gcs278 commented Aug 16, 2023

gcs278 commented Aug 17, 2023

openshift-ci bot commented Aug 17, 2023

gcs278 commented Aug 24, 2023

gcs278 commented Aug 24, 2023

openshift-ci bot commented Aug 24, 2023

gcs278 commented Aug 25, 2023

openshift-ci bot commented Aug 25, 2023

ShudiLi commented Aug 28, 2023

gcs278 commented Sep 12, 2023

alebedev87 commented Sep 13, 2023

alebedev87 commented Sep 14, 2023

gcs278 commented Sep 22, 2023

openshift-ci-robot commented Sep 22, 2023

gcs278 commented Sep 22, 2023

openshift-ci-robot commented Sep 22, 2023

openshift-merge-robot commented Sep 27, 2023

OCPBUGS-13968: Merge 1.11.1 #94

OCPBUGS-13968: Merge 1.11.1 #94

Conversation

gcs278 commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023 • edited Loading

Miciah commented Aug 16, 2023 • edited Loading

openshift-ci bot commented Aug 16, 2023

gcs278 commented Aug 16, 2023

gcs278 commented Aug 17, 2023

openshift-ci bot commented Aug 17, 2023

gcs278 commented Aug 24, 2023

gcs278 commented Aug 24, 2023

openshift-ci bot commented Aug 24, 2023

gcs278 commented Aug 25, 2023

openshift-ci bot commented Aug 25, 2023

ShudiLi commented Aug 28, 2023

gcs278 commented Sep 12, 2023

alebedev87 commented Sep 13, 2023

alebedev87 commented Sep 14, 2023

gcs278 commented Sep 22, 2023

openshift-ci-robot commented Sep 22, 2023

gcs278 commented Sep 22, 2023

openshift-ci-robot commented Sep 22, 2023

openshift-merge-robot commented Sep 27, 2023

openshift-ci bot commented Aug 16, 2023 •

edited

Loading

Miciah commented Aug 16, 2023 •

edited

Loading