Skip to content

Commit

Permalink
Freeze deps for 0.14 release. (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
markusthoemmes authored Apr 14, 2020
1 parent 21f046c commit 2bd5fd9
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 37 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
k8s.io/apiextensions-apiserver v0.17.2 // indirect
k8s.io/apimachinery v0.17.2
k8s.io/client-go v0.17.2
knative.dev/pkg v0.0.0-20200411011107-4e57475bc87c
knative.dev/serving v0.13.1-0.20200413040010-9985919eee99
knative.dev/test-infra v0.0.0-20200410223107-74b24ca44778
knative.dev/pkg v0.0.0-20200410152005-2a1db869228c
knative.dev/serving v0.13.1-0.20200414140916-f87352b72c48
knative.dev/test-infra v0.0.0-20200408192902-9fa5882b65c5
)
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -682,12 +682,12 @@ k8s.io/kubernetes v1.11.10/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk
k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
knative.dev/pkg v0.0.0-20200411011107-4e57475bc87c h1:Ip8DizCPYwj2uU5AKOT6uxMUnvzNZvUyWVR78SZinWE=
knative.dev/pkg v0.0.0-20200411011107-4e57475bc87c/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/serving v0.13.1-0.20200413040010-9985919eee99 h1:r40fVRBqz5TDWUnEhpJp5QajWuOeTSeG/AoKof9UsTU=
knative.dev/serving v0.13.1-0.20200413040010-9985919eee99/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
knative.dev/test-infra v0.0.0-20200410223107-74b24ca44778 h1:lO/sRkIu5OxmHnM6NjceBjfQT9rr+4WVvKmyJUnVu74=
knative.dev/test-infra v0.0.0-20200410223107-74b24ca44778/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
knative.dev/pkg v0.0.0-20200410152005-2a1db869228c h1:+Ob3pOC0WuNFxKv2UdMGkC0FGSbWC24FvJleJ8+Lp1A=
knative.dev/pkg v0.0.0-20200410152005-2a1db869228c/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/serving v0.13.1-0.20200414140916-f87352b72c48 h1:aWwI0wV5SlGkIqGjXIPtxnP0M3Glh13S7ViwFmsKRME=
knative.dev/serving v0.13.1-0.20200414140916-f87352b72c48/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
knative.dev/test-infra v0.0.0-20200408192902-9fa5882b65c5 h1:s275xBbVc2s7HnpXQ7TJyjMItSQo1eyUfBRwlLktc9g=
knative.dev/test-infra v0.0.0-20200408192902-9fa5882b65c5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
Expand Down
4 changes: 2 additions & 2 deletions hack/update-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ set -o pipefail
cd ${ROOT_DIR}

# This controls the release branch we track.
VERSION="master"
VERSION="release-0.14"

# The list of dependencies that we track at HEAD and periodically
# float forward in this repository.
FLOATING_DEPS=(
"knative.dev/test-infra"
"knative.dev/test-infra@${VERSION}"
"knative.dev/pkg@${VERSION}"
"knative.dev/serving@${VERSION}"
)
Expand Down
10 changes: 0 additions & 10 deletions vendor/knative.dev/pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,6 @@ func (c *Impl) EnqueueLabelOfClusterScopedResource(nameLabel string) func(obj in
}
}

// EnqueueNamespaceOf takes a resource, and enqueues the Namespace to which it belongs.
func (c *Impl) EnqueueNamespaceOf(obj interface{}) {
object, err := kmeta.DeletionHandlingAccessor(obj)
if err != nil {
c.logger.Errorw("EnqueueNamespaceOf", zap.Error(err))
return
}
c.EnqueueKey(types.NamespacedName{Name: object.GetNamespace()})
}

// EnqueueKey takes a namespace/name string and puts it onto the work queue.
func (c *Impl) EnqueueKey(key types.NamespacedName) {
c.WorkQueue.Add(key)
Expand Down
4 changes: 0 additions & 4 deletions vendor/knative.dev/pkg/logging/config

This file was deleted.

13 changes: 5 additions & 8 deletions vendor/knative.dev/pkg/metrics/config_observability.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,17 @@ type ObservabilityConfig struct {
EnableProfiling bool
}

func defaultConfig() *ObservabilityConfig {
return &ObservabilityConfig{
LoggingURLTemplate: DefaultLogURLTemplate,
RequestMetricsBackend: DefaultRequestMetricsBackend,
}
}

// NewObservabilityConfigFromConfigMap creates a ObservabilityConfig from the supplied ConfigMap
func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*ObservabilityConfig, error) {
oc := defaultConfig()
oc := &ObservabilityConfig{}
if evlc, ok := configMap.Data["logging.enable-var-log-collection"]; ok {
oc.EnableVarLogCollection = strings.EqualFold(evlc, "true")
}

if rut, ok := configMap.Data["logging.revision-url-template"]; ok {
oc.LoggingURLTemplate = rut
} else {
oc.LoggingURLTemplate = DefaultLogURLTemplate
}

if rlt, ok := configMap.Data["logging.request-log-template"]; ok {
Expand All @@ -93,6 +88,8 @@ func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*Observab

if mb, ok := configMap.Data["metrics.request-metrics-backend-destination"]; ok {
oc.RequestMetricsBackend = mb
} else {
oc.RequestMetricsBackend = DefaultRequestMetricsBackend
}

if prof, ok := configMap.Data["profiling.enable"]; ok {
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/test-infra/scripts/presubmit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function markdown_build_tests() {
(( DISABLE_MD_LINTING && DISABLE_MD_LINK_CHECK )) && return 0
# Get changed markdown files (ignore /vendor, github templates, and deleted files)
local mdfiles=""
for file in $(echo "${CHANGED_FILES}" | grep \\.md$ | grep -v ^vendor/ | grep -v ^.github/); do
for file in $(echo "${CHANGED_FILES}" | grep \.md$ | grep -v ^vendor/ | grep -v ^.github/); do
[[ -f "${file}" ]] && mdfiles="${mdfiles} ${file}"
done
[[ -z "${mdfiles}" ]] && return 0
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/pointer
k8s.io/utils/trace
# knative.dev/pkg v0.0.0-20200411011107-4e57475bc87c
# knative.dev/pkg v0.0.0-20200410152005-2a1db869228c
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
knative.dev/pkg/apis/duck/v1
Expand Down Expand Up @@ -755,7 +755,7 @@ knative.dev/pkg/tracker
knative.dev/pkg/version
knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates/resources
# knative.dev/serving v0.13.1-0.20200413040010-9985919eee99
# knative.dev/serving v0.13.1-0.20200414140916-f87352b72c48
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
knative.dev/serving/pkg/apis/config
Expand Down Expand Up @@ -816,7 +816,7 @@ knative.dev/serving/test/test_images/timeout
knative.dev/serving/test/test_images/wsserver
knative.dev/serving/test/types
knative.dev/serving/test/v1alpha1
# knative.dev/test-infra v0.0.0-20200410223107-74b24ca44778
# knative.dev/test-infra v0.0.0-20200408192902-9fa5882b65c5
knative.dev/test-infra/scripts
# sigs.k8s.io/yaml v1.1.0
sigs.k8s.io/yaml

0 comments on commit 2bd5fd9

Please sign in to comment.