oscerd closed pull request #166: Regenerate code, deps and fixes
URL: https://github.com/apache/camel-k/pull/166
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Gopkg.lock b/Gopkg.lock
index bb96322..3a9fc99 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -751,6 +751,7 @@
"k8s.io/apimachinery/pkg/runtime/schema",
"k8s.io/apimachinery/pkg/runtime/serializer/json",
"k8s.io/apimachinery/pkg/runtime/serializer/versioning",
+ "k8s.io/apimachinery/pkg/util/intstr",
"k8s.io/apimachinery/pkg/util/yaml",
"k8s.io/apimachinery/pkg/watch",
"k8s.io/client-go/plugin/pkg/client/auth/gcp",
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index 57ff452..d7ea010 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -334,6 +334,13 @@ func (in *IntegrationSpec) DeepCopyInto(out
*IntegrationSpec) {
*out = make([]string, len(*in))
copy(*out, *in)
}
+ if in.Traits != nil {
+ in, out := &in.Traits, &out.Traits
+ *out = make(map[string]IntegrationTraitSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = *val.DeepCopy()
+ }
+ }
if in.DependenciesAutoDiscovery != nil {
in, out := &in.DependenciesAutoDiscovery,
&out.DependenciesAutoDiscovery
*out = new(bool)
@@ -373,6 +380,34 @@ func (in *IntegrationStatus) DeepCopy() *IntegrationStatus
{
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver,
writing into out. in must be non-nil.
+func (in *IntegrationTraitSpec) DeepCopyInto(out *IntegrationTraitSpec) {
+ *out = *in
+ if in.Enabled != nil {
+ in, out := &in.Enabled, &out.Enabled
+ *out = new(bool)
+ **out = **in
+ }
+ if in.Configuration != nil {
+ in, out := &in.Configuration, &out.Configuration
+ *out = make(map[string]string, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver,
creating a new IntegrationTraitSpec.
+func (in *IntegrationTraitSpec) DeepCopy() *IntegrationTraitSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(IntegrationTraitSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver,
writing into out. in must be non-nil.
func (in *SourceSpec) DeepCopyInto(out *SourceSpec) {
*out = *in
diff --git a/pkg/client/cmd/get.go b/pkg/client/cmd/get.go
index 5b68adc..02d4726 100644
--- a/pkg/client/cmd/get.go
+++ b/pkg/client/cmd/get.go
@@ -61,7 +61,7 @@ func (o *getCmdOptions) run(cmd *cobra.Command, args
[]string) error {
return err
}
- w := tabwriter.NewWriter(os.Stdout, 0, 8, 0, '\t', 0)
+ w := tabwriter.NewWriter(os.Stdout, 0, 8, 1, '\t', 0)
fmt.Fprintln(w, "NAME\tCONTEXT\tSTATUS")
for _, integration := range integrationList.Items {
fmt.Fprintf(w, "%s\t%s\t%s\n", integration.Name,
integration.Spec.Context, string(integration.Status.Phase))
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
