You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2018/09/19 13:54:34 UTC
[camel-k] 09/09: chore: remove unused code
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8db26ed3089100ac327aa841f0884f4ba229f864
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 19 12:23:01 2018 +0200
chore: remove unused code
---
pkg/apis/camel/v1alpha1/register.go | 7 +-
pkg/build/local/scheme.go | 98 ------------------------
pkg/util/kubernetes/customclient/customclient.go | 1 +
pkg/util/kubernetes/customclient/scheme.go | 33 --------
4 files changed, 5 insertions(+), 134 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/register.go b/pkg/apis/camel/v1alpha1/register.go
index 52af408..460dd4c 100644
--- a/pkg/apis/camel/v1alpha1/register.go
+++ b/pkg/apis/camel/v1alpha1/register.go
@@ -31,14 +31,15 @@ const (
)
var (
- SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
- AddToScheme = SchemeBuilder.AddToScheme
// SchemeGroupVersion is the group version used to register these objects.
SchemeGroupVersion = schema.GroupVersion{Group: groupName, Version: version}
)
func init() {
- sdkK8sutil.AddToSDKScheme(AddToScheme)
+ schemeBuilder := runtime.NewSchemeBuilder(addKnownTypes)
+ addToScheme := schemeBuilder.AddToScheme
+
+ sdkK8sutil.AddToSDKScheme(addToScheme)
}
// addKnownTypes adds the set of types defined in this package to the supplied scheme.
diff --git a/pkg/build/local/scheme.go b/pkg/build/local/scheme.go
deleted file mode 100644
index 465c290..0000000
--- a/pkg/build/local/scheme.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package local
-
-import (
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime"
- "k8s.io/apimachinery/pkg/runtime/schema"
- "k8s.io/apimachinery/pkg/runtime/serializer"
- "k8s.io/apimachinery/pkg/runtime/serializer/json"
- "k8s.io/apimachinery/pkg/runtime/serializer/versioning"
-)
-
-var watchScheme = runtime.NewScheme()
-var basicScheme = runtime.NewScheme()
-var deleteScheme = runtime.NewScheme()
-var parameterScheme = runtime.NewScheme()
-var deleteOptionsCodec = serializer.NewCodecFactory(deleteScheme)
-var dynamicParameterCodec = runtime.NewParameterCodec(parameterScheme)
-
-var versionV1 = schema.GroupVersion{Version: "v1"}
-
-func init() {
- metav1.AddToGroupVersion(watchScheme, versionV1)
- metav1.AddToGroupVersion(basicScheme, versionV1)
- metav1.AddToGroupVersion(parameterScheme, versionV1)
- metav1.AddToGroupVersion(deleteScheme, versionV1)
-}
-
-var watchJsonSerializerInfo = runtime.SerializerInfo{
- MediaType: "application/json",
- EncodesAsText: true,
- Serializer: json.NewSerializer(json.DefaultMetaFactory, watchScheme, watchScheme, false),
- PrettySerializer: json.NewSerializer(json.DefaultMetaFactory, watchScheme, watchScheme, true),
- StreamSerializer: &runtime.StreamSerializerInfo{
- EncodesAsText: true,
- Serializer: json.NewSerializer(json.DefaultMetaFactory, watchScheme, watchScheme, false),
- Framer: json.Framer,
- },
-}
-
-// watchNegotiatedSerializer is used to read the wrapper of the watch stream
-type watchNegotiatedSerializer struct{}
-
-var watchNegotiatedSerializerInstance = watchNegotiatedSerializer{}
-
-func (s watchNegotiatedSerializer) SupportedMediaTypes() []runtime.SerializerInfo {
- return []runtime.SerializerInfo{watchJsonSerializerInfo}
-}
-
-func (s watchNegotiatedSerializer) EncoderForVersion(encoder runtime.Encoder, gv runtime.GroupVersioner) runtime.Encoder {
- return versioning.NewDefaultingCodecForScheme(watchScheme, encoder, nil, gv, nil)
-}
-
-func (s watchNegotiatedSerializer) DecoderToVersion(decoder runtime.Decoder, gv runtime.GroupVersioner) runtime.Decoder {
- return versioning.NewDefaultingCodecForScheme(watchScheme, nil, decoder, nil, gv)
-}
-
-// basicNegotiatedSerializer is used to handle discovery and error handling serialization
-type basicNegotiatedSerializer struct{}
-
-func (s basicNegotiatedSerializer) SupportedMediaTypes() []runtime.SerializerInfo {
- return []runtime.SerializerInfo{
- {
- MediaType: "application/json",
- EncodesAsText: true,
- Serializer: json.NewSerializer(json.DefaultMetaFactory, basicScheme, basicScheme, false),
- PrettySerializer: json.NewSerializer(json.DefaultMetaFactory, basicScheme, basicScheme, true),
- StreamSerializer: &runtime.StreamSerializerInfo{
- EncodesAsText: true,
- Serializer: json.NewSerializer(json.DefaultMetaFactory, basicScheme, basicScheme, false),
- Framer: json.Framer,
- },
- },
- }
-}
-
-func (s basicNegotiatedSerializer) EncoderForVersion(encoder runtime.Encoder, gv runtime.GroupVersioner) runtime.Encoder {
- return versioning.NewDefaultingCodecForScheme(watchScheme, encoder, nil, gv, nil)
-}
-
-func (s basicNegotiatedSerializer) DecoderToVersion(decoder runtime.Decoder, gv runtime.GroupVersioner) runtime.Decoder {
- return versioning.NewDefaultingCodecForScheme(watchScheme, nil, decoder, nil, gv)
-}
diff --git a/pkg/util/kubernetes/customclient/customclient.go b/pkg/util/kubernetes/customclient/customclient.go
index 9e38b6c..c0e3b64 100644
--- a/pkg/util/kubernetes/customclient/customclient.go
+++ b/pkg/util/kubernetes/customclient/customclient.go
@@ -23,6 +23,7 @@ import (
"k8s.io/client-go/rest"
)
+// GetClientFor returns a RESTClient for the given group and version
func GetClientFor(group string, version string) (*rest.RESTClient, error) {
inConfig := k8sclient.GetKubeConfig()
config := rest.CopyConfig(inConfig)
diff --git a/pkg/util/kubernetes/customclient/scheme.go b/pkg/util/kubernetes/customclient/scheme.go
index 7edcd02..9f62c42 100644
--- a/pkg/util/kubernetes/customclient/scheme.go
+++ b/pkg/util/kubernetes/customclient/scheme.go
@@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
- "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/apimachinery/pkg/runtime/serializer/versioning"
)
@@ -29,9 +28,6 @@ var watchScheme = runtime.NewScheme()
var basicScheme = runtime.NewScheme()
var deleteScheme = runtime.NewScheme()
var parameterScheme = runtime.NewScheme()
-var deleteOptionsCodec = serializer.NewCodecFactory(deleteScheme)
-var dynamicParameterCodec = runtime.NewParameterCodec(parameterScheme)
-
var versionV1 = schema.GroupVersion{Version: "v1"}
func init() {
@@ -41,35 +37,6 @@ func init() {
metav1.AddToGroupVersion(deleteScheme, versionV1)
}
-var watchJsonSerializerInfo = runtime.SerializerInfo{
- MediaType: "application/json",
- EncodesAsText: true,
- Serializer: json.NewSerializer(json.DefaultMetaFactory, watchScheme, watchScheme, false),
- PrettySerializer: json.NewSerializer(json.DefaultMetaFactory, watchScheme, watchScheme, true),
- StreamSerializer: &runtime.StreamSerializerInfo{
- EncodesAsText: true,
- Serializer: json.NewSerializer(json.DefaultMetaFactory, watchScheme, watchScheme, false),
- Framer: json.Framer,
- },
-}
-
-// watchNegotiatedSerializer is used to read the wrapper of the watch stream
-type watchNegotiatedSerializer struct{}
-
-var watchNegotiatedSerializerInstance = watchNegotiatedSerializer{}
-
-func (s watchNegotiatedSerializer) SupportedMediaTypes() []runtime.SerializerInfo {
- return []runtime.SerializerInfo{watchJsonSerializerInfo}
-}
-
-func (s watchNegotiatedSerializer) EncoderForVersion(encoder runtime.Encoder, gv runtime.GroupVersioner) runtime.Encoder {
- return versioning.NewDefaultingCodecForScheme(watchScheme, encoder, nil, gv, nil)
-}
-
-func (s watchNegotiatedSerializer) DecoderToVersion(decoder runtime.Decoder, gv runtime.GroupVersioner) runtime.Decoder {
- return versioning.NewDefaultingCodecForScheme(watchScheme, nil, decoder, nil, gv)
-}
-
// basicNegotiatedSerializer is used to handle discovery and error handling serialization
type basicNegotiatedSerializer struct{}