Skip to content
This repository has been archived by the owner on Jun 4, 2021. It is now read-only.

Bump to K8s 18.8 #1555

Merged
merged 12 commits into from
Sep 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion awssqs/pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions awssqs/pkg/reconciler/awssqssource.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, src *v1alpha1.AwsSqsSour
APIVersion: src.Spec.Sink.APIVersion,
},
}
sinkURI, err := r.sinkResolver.URIFromDestinationV1(*dest, src)
sinkURI, err := r.sinkResolver.URIFromDestinationV1(ctx, *dest, src)
if err != nil {
src.Status.MarkNoSink("NotFound", "")
return err
Expand Down Expand Up @@ -123,13 +123,13 @@ func (r *Reconciler) createReceiveAdapter(ctx context.Context, src *v1alpha1.Aws
SinkURI: src.Status.SinkURI.String(),
})

ra, err = r.kubeClientSet.AppsV1().Deployments(src.Namespace).Create(expected)
ra, err = r.kubeClientSet.AppsV1().Deployments(src.Namespace).Create(ctx, expected, metav1.CreateOptions{})
logging.FromContext(ctx).Desugar().Info("Receive Adapter created.", zap.Error(err), zap.Any("receiveAdapter", ra))
return ra, err
}

func (r *Reconciler) getReceiveAdapter(ctx context.Context, src *v1alpha1.AwsSqsSource) (*appsv1.Deployment, error) {
dl, err := r.kubeClientSet.AppsV1().Deployments(src.Namespace).List(metav1.ListOptions{
dl, err := r.kubeClientSet.AppsV1().Deployments(src.Namespace).List(ctx, metav1.ListOptions{
LabelSelector: r.getLabelSelector(src).String(),
})

Expand Down
9 changes: 0 additions & 9 deletions camel/OWNERS

This file was deleted.

3 changes: 0 additions & 3 deletions camel/source/PROJECT

This file was deleted.

Loading