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.

Sign up for GitHub

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

[main] Upgrade to latest dependencies #93

Merged
merged 1 commit into from
Sep 27, 2024
Merged

[main] Upgrade to latest dependencies #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ require (
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
k8s.io/client-go v0.30.3
knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2
knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a
knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d
knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a
knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7
knative.dev/pkg v0.0.0-20240926013127-c4843b746d24
knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042
)

require (
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,14 +801,14 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2 h1:Mju6ncF1Aae3HwZ7HH+++1s7O+NQYFi40m+/lOGiBVc=
knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2/go.mod h1:CguA8wPeeeED9ZIAJ+NqCo8fGj1W3gkEvTQs7Enk/oo=
knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a h1:HnJ8kus8avX0oMuzA1K3mKKV+mZJ32kJGqvtIYcoeEw=
knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a/go.mod h1:CguA8wPeeeED9ZIAJ+NqCo8fGj1W3gkEvTQs7Enk/oo=
knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d h1:mgROhGJG3+g0SBkaG4Y2HxrIOLN3ZZcN4+IFZla+Zqs=
knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a h1:AFR8PmM3le4Uf58XRJzj0Z/ajyCUriqebCk6hyc0M6g=
knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a/go.mod h1:IQi7fVFvQa6UpNnSpzlAiNPMtTvIj4MHj4vSD/PulCE=
knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7 h1:cOWObcgQx26mGKsSnacKgnIOZFqkgVdeGqoVh9QDrRs=
knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7/go.mod h1:PXOqfSSDHzaVPXrpEPlxsOSQRIQJGnSrj2IuVQh3Kas=
knative.dev/pkg v0.0.0-20240926013127-c4843b746d24 h1:NJLvfA38IlzdSxNi5//yEpKeZBPezyQZA4SCcoMjC9o=
knative.dev/pkg v0.0.0-20240926013127-c4843b746d24/go.mod h1:IQi7fVFvQa6UpNnSpzlAiNPMtTvIj4MHj4vSD/PulCE=
knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042 h1:iex7NiH53E+EDGdC7ekbr3YL0qVlONHvZOYLra76y1Y=
knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042/go.mod h1:PXOqfSSDHzaVPXrpEPlxsOSQRIQJGnSrj2IuVQh3Kas=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
3 changes: 3 additions & 0 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ metadata:
namespace: {{ .namespace }}
labels:
app: eventshub-{{ .name }}
{{ range $key, $value := .labels }}
{{ $key }}: "{{ $value }}"
{{ end }}
{{ if .annotations }}
annotations:
{{ range $key, $value := .annotations }}
Expand Down
12 changes: 10 additions & 2 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/104-forwarder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,20 @@ metadata:
{{ end }}
spec:
template:
{{ if .podannotations }}
{{ if or .podannotations .podlabels }}
metadata:
{{ if .podannotations }}
annotations:
{{ range $key, $value := .podannotations }}
{{ $key }}: "{{ $value }}"
{{ end }}
{{ end }}
{{ end }}
{{ if .podlabels }}
labels:
{{ range $key, $value := .podlabels }}
{{ $key }}: "{{ $value }}"
{{ end }}
{{ end }}
{{ end }}
spec:
serviceAccountName: "{{ .name }}"
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ func Install(name string, options ...EventsHubOption) feature.StepFn {

if ic := environment.GetIstioConfig(ctx); ic.Enabled {
manifest.WithIstioPodAnnotations(cfg)
manifest.WithIstioPodLabels(cfg)
}

manifest.PodSecurityCfgFn(ctx, t)(cfg)
Expand Down
24 changes: 24 additions & 0 deletions vendor/knative.dev/reconciler-test/pkg/manifest/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ func WithPodAnnotations(additional map[string]interface{}) CfgFn {
}
}

// WithPodLabels appends pod labels (usually used by types where pod template is embedded)
func WithPodLabels(additional map[string]string) CfgFn {
return func(cfg map[string]interface{}) {
if ann, ok := cfg["podlabels"]; ok {
m := make(map[string]interface{}, len(additional))
for k, v := range additional {
m[k] = v
}
appendToOriginal(ann, m)
return
}
cfg["podlabels"] = additional
}
}

func appendToOriginal(original interface{}, additional map[string]interface{}) {
annotations := original.(map[string]interface{})
for k, v := range additional {
Expand Down Expand Up @@ -92,3 +107,12 @@ func WithIstioPodAnnotations(cfg map[string]interface{}) {
WithAnnotations(podAnnotations)(cfg)
WithPodAnnotations(podAnnotations)(cfg)
}

func WithIstioPodLabels(cfg map[string]interface{}) {
podLabels := map[string]string{
"sidecar.istio.io/inject": "true",
}

WithLabels(podLabels)(cfg)
WithPodLabels(podLabels)(cfg)
}
6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/eventing v0.42.1-0.20240923135023-641cbb7dffe2
# knative.dev/eventing v0.42.1-0.20240926123447-e7fca7646f4a
## explicit; go 1.22.0
knative.dev/eventing/hack
knative.dev/eventing/pkg/apis
Expand Down Expand Up @@ -1088,7 +1088,7 @@ knative.dev/eventing/pkg/utils
# knative.dev/hack v0.0.0-20240909014011-fc6a8452af6d
## explicit; go 1.21
knative.dev/hack
# knative.dev/pkg v0.0.0-20240924202102-28b58b842f1a
# knative.dev/pkg v0.0.0-20240926013127-c4843b746d24
## explicit; go 1.22.0
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
Expand Down Expand Up @@ -1147,7 +1147,7 @@ knative.dev/pkg/tracing/config
knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
# knative.dev/reconciler-test v0.0.0-20240924141745-1fee6baa20b7
# knative.dev/reconciler-test v0.0.0-20240926123451-87d857060042
## explicit; go 1.22.0
knative.dev/reconciler-test/cmd/eventshub
knative.dev/reconciler-test/pkg/environment
Expand Down
Loading