Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
85316762
Commit
85316762
authored
Dec 20, 2016
by
Aaron.L.Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typo for federation/*
parent
b3b9bcc0
Hide whitespace changes
Inline
Side-by-side
Showing
54 changed files
with
74 additions
and
74 deletions
+74
-74
types.go
federation/apis/federation/types.go
+3
-3
types.go
federation/apis/federation/v1beta1/types.go
+1
-1
validation_test.go
federation/apis/federation/validation/validation_test.go
+1
-1
plugins.go
federation/pkg/dnsprovider/plugins.go
+1
-1
interface.go
...ration/pkg/dnsprovider/providers/aws/route53/interface.go
+1
-1
route53api.go
...pkg/dnsprovider/providers/aws/route53/stubs/route53api.go
+1
-1
zone.go
federation/pkg/dnsprovider/providers/aws/route53/zone.go
+1
-1
zones.go
federation/pkg/dnsprovider/providers/aws/route53/zones.go
+1
-1
changes_create_call.go
...providers/google/clouddns/internal/changes_create_call.go
+1
-1
changes_service.go
...der/providers/google/clouddns/internal/changes_service.go
+1
-1
managed_zone.go
...ovider/providers/google/clouddns/internal/managed_zone.go
+1
-1
managed_zone_create_call.go
...ders/google/clouddns/internal/managed_zone_create_call.go
+1
-1
managed_zones_delete_call.go
...ers/google/clouddns/internal/managed_zones_delete_call.go
+1
-1
managed_zones_get_call.go
...viders/google/clouddns/internal/managed_zones_get_call.go
+1
-1
managed_zones_list_call.go
...iders/google/clouddns/internal/managed_zones_list_call.go
+1
-1
managed_zones_list_response.go
...s/google/clouddns/internal/managed_zones_list_response.go
+1
-1
managed_zones_service.go
...oviders/google/clouddns/internal/managed_zones_service.go
+1
-1
rrset.go
...g/dnsprovider/providers/google/clouddns/internal/rrset.go
+1
-1
rrsets_list_call.go
...er/providers/google/clouddns/internal/rrsets_list_call.go
+1
-1
rrsets_list_response.go
...roviders/google/clouddns/internal/rrsets_list_response.go
+1
-1
rrsets_service.go
...ider/providers/google/clouddns/internal/rrsets_service.go
+1
-1
service.go
...dnsprovider/providers/google/clouddns/internal/service.go
+1
-1
change.go
...ovider/providers/google/clouddns/internal/stubs/change.go
+1
-1
changes_create_call.go
...ers/google/clouddns/internal/stubs/changes_create_call.go
+1
-1
changes_service.go
...oviders/google/clouddns/internal/stubs/changes_service.go
+1
-1
managed_zone.go
.../providers/google/clouddns/internal/stubs/managed_zone.go
+1
-1
managed_zone_create_call.go
...oogle/clouddns/internal/stubs/managed_zone_create_call.go
+1
-1
managed_zones_delete_call.go
...ogle/clouddns/internal/stubs/managed_zones_delete_call.go
+1
-1
managed_zones_get_call.go
.../google/clouddns/internal/stubs/managed_zones_get_call.go
+1
-1
managed_zones_list_call.go
...google/clouddns/internal/stubs/managed_zones_list_call.go
+1
-1
managed_zones_list_response.go
...le/clouddns/internal/stubs/managed_zones_list_response.go
+1
-1
managed_zones_service.go
...s/google/clouddns/internal/stubs/managed_zones_service.go
+1
-1
rrset.go
...rovider/providers/google/clouddns/internal/stubs/rrset.go
+1
-1
rrsets_list_call.go
...viders/google/clouddns/internal/stubs/rrsets_list_call.go
+1
-1
rrsets_list_response.go
...rs/google/clouddns/internal/stubs/rrsets_list_response.go
+1
-1
rrsets_service.go
...roviders/google/clouddns/internal/stubs/rrsets_service.go
+2
-2
rrset.go
...ration/pkg/dnsprovider/providers/google/clouddns/rrset.go
+1
-1
ingress_controller.go
...n/pkg/federation-controller/ingress/ingress_controller.go
+6
-6
ingress_controller_test.go
.../federation-controller/ingress/ingress_controller_test.go
+1
-1
namespace_controller.go
...g/federation-controller/namespace/namespace_controller.go
+5
-5
secret_controller.go
...ion/pkg/federation-controller/secret/secret_controller.go
+1
-1
secret_controller_test.go
...kg/federation-controller/secret/secret_controller_test.go
+1
-1
cluster_helper.go
...ation/pkg/federation-controller/service/cluster_helper.go
+1
-1
servicecontroller.go
...on/pkg/federation-controller/service/servicecontroller.go
+3
-3
cluster_util.go
federation/pkg/federation-controller/util/cluster_util.go
+2
-2
configmap.go
federation/pkg/federation-controller/util/configmap.go
+1
-1
deployment.go
federation/pkg/federation-controller/util/deployment.go
+1
-1
eventsink.go
...ion/pkg/federation-controller/util/eventsink/eventsink.go
+1
-1
federated_informer.go
...tion/pkg/federation-controller/util/federated_informer.go
+2
-2
planner.go
federation/pkg/federation-controller/util/planner/planner.go
+3
-3
secret.go
federation/pkg/federation-controller/util/secret.go
+1
-1
test_helper.go
...ration/pkg/federation-controller/util/test/test_helper.go
+3
-3
init.go
federation/pkg/kubefed/init/init.go
+1
-1
util.go
federation/pkg/kubefed/util/util.go
+1
-1
No files found.
federation/apis/federation/types.go
View file @
85316762
...
...
@@ -76,7 +76,7 @@ type ClusterCondition struct {
Message
string
}
// ClusterStatus is information about the current status of a cluster updated by cluster controller peri
do
cally.
// ClusterStatus is information about the current status of a cluster updated by cluster controller peri
odi
cally.
type
ClusterStatus
struct
{
// Conditions is an array of current cluster conditions.
// +optional
...
...
@@ -124,8 +124,8 @@ type ClusterList struct {
// Temporary/alpha structures to support custom replica assignments within FederatedReplicaSet.
// A set of preferences that can be added to federated version of ReplicaSet as a json-serialized annotation.
// The preferences allow the user to express in which c
ul
sters he wants to put his replicas within the
// mentiond FederatedReplicaSet.
// The preferences allow the user to express in which c
lu
sters he wants to put his replicas within the
// mention
e
d FederatedReplicaSet.
type
FederatedReplicaSetPreferences
struct
{
// If set to true then already scheduled and running replicas may be moved to other clusters to
// in order to bring cluster replicasets towards a desired state. Otherwise, if set to false,
...
...
federation/apis/federation/v1beta1/types.go
View file @
85316762
...
...
@@ -76,7 +76,7 @@ type ClusterCondition struct {
Message
string
`json:"message,omitempty" protobuf:"bytes,6,opt,name=message"`
}
// ClusterStatus is information about the current status of a cluster updated by cluster controller peri
do
cally.
// ClusterStatus is information about the current status of a cluster updated by cluster controller peri
odi
cally.
type
ClusterStatus
struct
{
// Conditions is an array of current cluster conditions.
// +optional
...
...
federation/apis/federation/validation/validation_test.go
View file @
85316762
...
...
@@ -76,7 +76,7 @@ func TestValidateCluster(t *testing.T) {
for
testName
,
errorCase
:=
range
errorCases
{
errs
:=
ValidateCluster
(
&
errorCase
)
if
len
(
errs
)
==
0
{
t
.
Errorf
(
"expected failur for %s"
,
testName
)
t
.
Errorf
(
"expected failur
e
for %s"
,
testName
)
}
}
}
...
...
federation/pkg/dnsprovider/plugins.go
View file @
85316762
...
...
@@ -51,7 +51,7 @@ func RegisterDnsProvider(name string, cloud Factory) {
// the name is not known. The error return is only used if the named provider
// was known but failed to initialize. The config parameter specifies the
// io.Reader handler of the configuration file for the DNS provider, or nil
// for no configuation.
// for no configu
r
ation.
func
GetDnsProvider
(
name
string
,
config
io
.
Reader
)
(
Interface
,
error
)
{
providersMutex
.
Lock
()
defer
providersMutex
.
Unlock
()
...
...
federation/pkg/dnsprovider/providers/aws/route53/interface.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53/stubs"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
dnsprovider
.
Interface
=
Interface
{}
type
Interface
struct
{
...
...
federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go
View file @
85316762
...
...
@@ -44,7 +44,7 @@ type Route53APIStub struct {
recordSets
map
[
string
]
map
[
string
][]
*
route53
.
ResourceRecordSet
}
// NewRoute53APIStub returns an init
l
ialized Route53APIStub
// NewRoute53APIStub returns an initialized Route53APIStub
func
NewRoute53APIStub
()
*
Route53APIStub
{
return
&
Route53APIStub
{
zones
:
make
(
map
[
string
]
*
route53
.
HostedZone
),
...
...
federation/pkg/dnsprovider/providers/aws/route53/zone.go
View file @
85316762
...
...
@@ -24,7 +24,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
dnsprovider
.
Zone
=
&
Zone
{}
type
Zone
struct
{
...
...
federation/pkg/dnsprovider/providers/aws/route53/zones.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/util/uuid"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
dnsprovider
.
Zones
=
Zones
{}
type
Zones
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ChangesCreateCall
=
ChangesCreateCall
{}
type
ChangesCreateCall
struct
{
impl
*
dns
.
ChangesCreateCall
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ChangesService
=
ChangesService
{}
type
ChangesService
struct
{
impl
*
dns
.
ChangesService
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZone
=
ManagedZone
{}
type
ManagedZone
struct
{
impl
*
dns
.
ManagedZone
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesCreateCall
=
ManagedZonesCreateCall
{}
type
ManagedZonesCreateCall
struct
{
impl
*
dns
.
ManagedZonesCreateCall
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesDeleteCall
=
ManagedZonesDeleteCall
{}
type
ManagedZonesDeleteCall
struct
{
impl
*
dns
.
ManagedZonesDeleteCall
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesGetCall
=
ManagedZonesGetCall
{}
type
ManagedZonesGetCall
struct
{
impl
*
dns
.
ManagedZonesGetCall
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesListCall
=
&
ManagedZonesListCall
{}
type
ManagedZonesListCall
struct
{
impl
*
dns
.
ManagedZonesListCall
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesListResponse
=
&
ManagedZonesListResponse
{}
type
ManagedZonesListResponse
struct
{
impl
*
dns
.
ManagedZonesListResponse
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go
View file @
85316762
...
...
@@ -24,7 +24,7 @@ import (
"k8s.io/kubernetes/pkg/util/uuid"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesService
=
&
ManagedZonesService
{}
type
ManagedZonesService
struct
{
impl
*
dns
.
ManagedZonesService
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSet
=
ResourceRecordSet
{}
type
ResourceRecordSet
struct
{
impl
*
dns
.
ResourceRecordSet
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSetsListCall
=
&
ResourceRecordSetsListCall
{}
type
ResourceRecordSetsListCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSetsListResponse
=
&
ResourceRecordSetsListResponse
{}
type
ResourceRecordSetsListResponse
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSetsService
=
&
ResourceRecordSetsService
{}
type
ResourceRecordSetsService
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
Service
=
&
Service
{}
type
Service
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
Change
=
&
Change
{}
type
Change
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ChangesCreateCall
=
ChangesCreateCall
{}
type
ChangesCreateCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ChangesService
=
&
ChangesService
{}
type
ChangesService
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZone
=
ManagedZone
{}
type
ManagedZone
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesCreateCall
=
ManagedZonesCreateCall
{}
type
ManagedZonesCreateCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesDeleteCall
=
ManagedZonesDeleteCall
{}
type
ManagedZonesDeleteCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesGetCall
=
ManagedZonesGetCall
{}
type
ManagedZonesGetCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesListCall
=
&
ManagedZonesListCall
{}
type
ManagedZonesListCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesListResponse
=
&
ManagedZonesListResponse
{}
type
ManagedZonesListResponse
struct
{
ManagedZones_
[]
interfaces
.
ManagedZone
}
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ManagedZonesService
=
&
ManagedZonesService
{}
type
ManagedZonesService
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSet
=
ResourceRecordSet
{}
type
ResourceRecordSet
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go
View file @
85316762
...
...
@@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSetsListCall
=
&
ResourceRecordSetsListCall
{}
type
ResourceRecordSetsListCall
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go
View file @
85316762
...
...
@@ -18,7 +18,7 @@ package stubs
import
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSetsListResponse
=
&
ResourceRecordSetsListResponse
{}
type
ResourceRecordSetsListResponse
struct
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go
View file @
85316762
...
...
@@ -23,12 +23,12 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
interfaces
.
ResourceRecordSetsService
=
&
ResourceRecordSetsService
{}
type
ResourceRecordSetsService
struct
{
Service
*
Service
ListCall
interfaces
.
ResourceRecordSetsListCall
// Use to override response if reqired for testing
ListCall
interfaces
.
ResourceRecordSetsListCall
// Use to override response if req
u
ired for testing
}
func
(
s
ResourceRecordSetsService
)
List
(
project
string
,
managedZone
string
)
interfaces
.
ResourceRecordSetsListCall
{
...
...
federation/pkg/dnsprovider/providers/google/clouddns/rrset.go
View file @
85316762
...
...
@@ -24,7 +24,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
)
// Compile time check for interface ad
e
herence
// Compile time check for interface adherence
var
_
dnsprovider
.
ResourceRecordSet
=
ResourceRecordSet
{}
type
ResourceRecordSet
struct
{
...
...
federation/pkg/federation-controller/ingress/ingress_controller.go
View file @
85316762
...
...
@@ -67,16 +67,16 @@ var (
type
IngressController
struct
{
sync
.
Mutex
// Lock used for leader election
// For triggering single ingress reconcilation. This is used when there is an
// For triggering single ingress reconcil
i
ation. This is used when there is an
// add/update/delete operation on an ingress in either federated API server or
// in some member of the federation.
ingressDeliverer
*
util
.
DelayingDeliverer
// For triggering reconcilation of cluster ingress controller configmap and
// For triggering reconcil
i
ation of cluster ingress controller configmap and
// all ingresses. This is used when a new cluster becomes available.
clusterDeliverer
*
util
.
DelayingDeliverer
// For triggering reconcilation of cluster ingress controller configmap.
// For triggering reconcil
i
ation of cluster ingress controller configmap.
// This is used when a configmap is updated in the cluster.
configMapDeliverer
*
util
.
DelayingDeliverer
...
...
@@ -208,7 +208,7 @@ func NewIngressController(client federationclientset.Interface) *IngressControll
},
&
v1
.
ConfigMap
{},
controller
.
NoResyncPeriodFunc
(),
// Trigger reconcilation whenever the ingress controller's configmap in a federated cluster is changed. In most cases it
// Trigger reconcil
i
ation whenever the ingress controller's configmap in a federated cluster is changed. In most cases it
// would be just confirmation that the configmap for the ingress controller is correct.
util
.
NewTriggerOnAllChanges
(
func
(
obj
pkgruntime
.
Object
)
{
...
...
@@ -362,7 +362,7 @@ func (ic *IngressController) Run(stopChan <-chan struct{}) {
ic
.
ingressFederatedInformer
.
Stop
()
glog
.
Infof
(
"Stopping ConfigMap Federated Informer"
)
ic
.
configMapFederatedInformer
.
Stop
()
glog
.
Infof
(
"Stop
o
ing ingress deliverer"
)
glog
.
Infof
(
"Stop
p
ing ingress deliverer"
)
ic
.
ingressDeliverer
.
Stop
()
glog
.
Infof
(
"Stopping configmap deliverer"
)
ic
.
configMapDeliverer
.
Stop
()
...
...
@@ -465,7 +465,7 @@ func (ic *IngressController) isSynced() bool {
return
true
}
// The function triggers reconcilation of all federated ingresses. clusterName is the name of the cluster that changed
// The function triggers reconcil
i
ation of all federated ingresses. clusterName is the name of the cluster that changed
// but all ingresses in all clusters are reconciled
func
(
ic
*
IngressController
)
reconcileIngressesOnClusterChange
(
clusterName
string
)
{
glog
.
V
(
4
)
.
Infof
(
"Reconciling ingresses on cluster change for cluster %q"
,
clusterName
)
...
...
federation/pkg/federation-controller/ingress/ingress_controller_test.go
View file @
85316762
...
...
@@ -138,7 +138,7 @@ func TestIngressController(t *testing.T) {
assert
.
NotNil
(
t
,
cluster
)
assert
.
Equal
(
t
,
cluster
.
ObjectMeta
.
Annotations
[
uidAnnotationKey
],
cfg1
.
Data
[
uidKey
])
t
.
Logf
(
"Checking that appropr
o
ate finalizers are added"
)
t
.
Logf
(
"Checking that appropr
i
ate finalizers are added"
)
// There should be 2 updates to add both the finalizers.
updatedIngress
:=
GetIngressFromChan
(
t
,
fedIngressUpdateChan
)
assert
.
True
(
t
,
ingressController
.
hasFinalizerFunc
(
updatedIngress
,
deletionhelper
.
FinalizerDeleteFromUnderlyingClusters
))
...
...
federation/pkg/federation-controller/namespace/namespace_controller.go
View file @
85316762
...
...
@@ -95,7 +95,7 @@ func NewNamespaceController(client federationclientset.Interface) *NamespaceCont
eventRecorder
:
recorder
,
}
// Build deliverer
e
s for triggering reconciliations.
// Build deliverers for triggering reconciliations.
nc
.
namespaceDeliverer
=
util
.
NewDelayingDeliverer
()
nc
.
clusterDeliverer
=
util
.
NewDelayingDeliverer
()
...
...
@@ -129,7 +129,7 @@ func NewNamespaceController(client federationclientset.Interface) *NamespaceCont
&
apiv1
.
Namespace
{},
controller
.
NoResyncPeriodFunc
(),
// Trigger reconciliation whenever something in federated cluster is changed. In most cases it
// would be just confirmation that some namespace opration succeeded.
// would be just confirmation that some namespace op
e
ration succeeded.
util
.
NewTriggerOnMetaAndSpecChanges
(
func
(
obj
runtime
.
Object
)
{
nc
.
deliverNamespaceObj
(
obj
,
nc
.
namespaceReviewDelay
,
false
)
},
))
...
...
@@ -142,7 +142,7 @@ func NewNamespaceController(client federationclientset.Interface) *NamespaceCont
},
)
// Federated upd
e
ater along with Create/Update/Delete operations.
// Federated updater along with Create/Update/Delete operations.
nc
.
federatedUpdater
=
util
.
NewFederatedUpdater
(
nc
.
namespaceFederatedInformer
,
func
(
client
kubeclientset
.
Interface
,
obj
runtime
.
Object
)
error
{
namespace
:=
obj
.
(
*
apiv1
.
Namespace
)
...
...
@@ -435,7 +435,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
return
}
// Ever
ty
hing is in order but lets be double sure
// Ever
yt
hing is in order but lets be double sure
nc
.
deliverNamespace
(
namespace
,
nc
.
namespaceReviewDelay
,
false
)
}
...
...
@@ -489,7 +489,7 @@ func (nc *NamespaceController) delete(namespace *apiv1.Namespace) error {
// Ensures that all resources in this namespace are deleted and then removes the kubernetes finalizer.
func
(
nc
*
NamespaceController
)
removeKubernetesFinalizer
(
namespace
*
apiv1
.
Namespace
)
(
*
apiv1
.
Namespace
,
error
)
{
// Right now there are just 7 types of objects: Deployments, DaemonSets, ReplicaSet, Secret, Ingress, Events and Service.
// Temporarly these items are simply deleted one by one to squeeze this code into 1.4.
// Temporar
i
ly these items are simply deleted one by one to squeeze this code into 1.4.
// TODO: Make it generic (like in the regular namespace controller) and parallel.
err
:=
nc
.
federatedApiClient
.
Core
()
.
Services
(
namespace
.
Name
)
.
DeleteCollection
(
&
apiv1
.
DeleteOptions
{},
apiv1
.
ListOptions
{})
if
err
!=
nil
{
...
...
federation/pkg/federation-controller/secret/secret_controller.go
View file @
85316762
...
...
@@ -130,7 +130,7 @@ func NewSecretController(client federationclientset.Interface) *SecretController
&
apiv1
.
Secret
{},
controller
.
NoResyncPeriodFunc
(),
// Trigger reconciliation whenever something in federated cluster is changed. In most cases it
// would be just confirmation that some secret opration succeeded.
// would be just confirmation that some secret op
e
ration succeeded.
util
.
NewTriggerOnAllChanges
(
func
(
obj
pkgruntime
.
Object
)
{
secretcontroller
.
deliverSecretObj
(
obj
,
secretcontroller
.
secretReviewDelay
,
false
)
...
...
federation/pkg/federation-controller/secret/secret_controller_test.go
View file @
85316762
...
...
@@ -176,7 +176,7 @@ func setClientFactory(informer util.FederatedInformer, informerClientFactory fun
func
secretsEqual
(
a
,
b
apiv1
.
Secret
)
bool
{
// Clear the SelfLink and ObjectMeta.Finalizers since they will be different
// in resoure in federation control plane and resource in underlying cluster.
// in resour
c
e in federation control plane and resource in underlying cluster.
a
.
SelfLink
=
""
b
.
SelfLink
=
""
a
.
ObjectMeta
.
Finalizers
=
[]
string
{}
...
...
federation/pkg/federation-controller/service/cluster_helper.go
View file @
85316762
...
...
@@ -145,7 +145,7 @@ func (cc *clusterClientCache) startClusterLW(cluster *v1beta1.Cluster, clusterNa
DeleteFunc
:
func
(
obj
interface
{})
{
service
,
_
:=
obj
.
(
*
v1
.
Service
)
cc
.
enqueueService
(
obj
,
clusterName
)
glog
.
V
(
2
)
.
Infof
(
"Service %s/%s deletion found and enque to service store %s"
,
service
.
Namespace
,
service
.
Name
,
clusterName
)
glog
.
V
(
2
)
.
Infof
(
"Service %s/%s deletion found and enque
ue
to service store %s"
,
service
.
Namespace
,
service
.
Name
,
clusterName
)
},
},
cache
.
Indexers
{
cache
.
NamespaceIndex
:
cache
.
MetaNamespaceIndexFunc
},
...
...
federation/pkg/federation-controller/service/servicecontroller.go
View file @
85316762
...
...
@@ -82,7 +82,7 @@ type cachedService struct {
serviceStatusMap
map
[
string
]
v1
.
LoadBalancerStatus
// Ensures only one goroutine can operate on this service at any given time.
rwlock
sync
.
Mutex
// Controls error back-off for proc
c
eeding federation service to k8s clusters
// Controls error back-off for proceeding federation service to k8s clusters
lastRetryDelay
time
.
Duration
// Controls error back-off for updating federation service back to federation apiserver
lastFedUpdateDelay
time
.
Duration
...
...
@@ -381,7 +381,7 @@ func (s *ServiceController) updateFederationService(key string, cachedService *c
}(
cache
,
clusterName
)
}
if
hasErr
{
// detail error has been dump
p
ed inside the loop
// detail error has been dumped inside the loop
return
fmt
.
Errorf
(
"Service %s/%s was not successfully updated to all clusters"
,
service
.
Namespace
,
service
.
Name
),
retryable
}
return
nil
,
!
retryable
...
...
@@ -880,7 +880,7 @@ func (s *ServiceController) processServiceUpdate(cachedService *cachedService, s
cachedService
.
appliedState
=
service
s
.
serviceCache
.
set
(
key
,
cachedService
)
glog
.
V
(
4
)
.
Infof
(
"Successfully proc
c
eeded services %s"
,
key
)
glog
.
V
(
4
)
.
Infof
(
"Successfully proceeded services %s"
,
key
)
cachedService
.
resetRetryDelay
()
return
nil
,
doNotRetry
}
...
...
federation/pkg/federation-controller/util/cluster_util.go
View file @
85316762
...
...
@@ -92,7 +92,7 @@ var KubeconfigGetterForCluster = func(c *federation_v1beta1.Cluster) clientcmd.K
}
}
// KubeconfigGett
t
erForSecret is used to get the kubeconfig from the given secret.
// KubeconfigGetterForSecret is used to get the kubeconfig from the given secret.
var
KubeconfigGetterForSecret
=
func
(
secretName
string
)
clientcmd
.
KubeconfigGetter
{
return
func
()
(
*
clientcmdapi
.
Config
,
error
)
{
var
data
[]
byte
...
...
@@ -137,7 +137,7 @@ var KubeconfigGetterForSecret = func(secretName string) clientcmd.KubeconfigGett
}
}
// Ret
ru
ns Clientset for the given cluster.
// Ret
ur
ns Clientset for the given cluster.
func
GetClientsetForCluster
(
cluster
*
federation_v1beta1
.
Cluster
)
(
*
fedclientset
.
Clientset
,
error
)
{
clusterConfig
,
err
:=
BuildClusterConfig
(
cluster
)
if
err
!=
nil
&&
clusterConfig
!=
nil
{
...
...
federation/pkg/federation-controller/util/configmap.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
api_v1
"k8s.io/kubernetes/pkg/api/v1"
)
// Checks if cluster-independent, user provided data in two given ConfigMaps
s are eqau
l. If in
// Checks if cluster-independent, user provided data in two given ConfigMaps
are equa
l. If in
// the future the ConfigMap structure is expanded then any field that is not populated.
// by the api server should be included here.
func
ConfigMapEquivalent
(
s1
,
s2
*
api_v1
.
ConfigMap
)
bool
{
...
...
federation/pkg/federation-controller/util/deployment.go
View file @
85316762
...
...
@@ -24,7 +24,7 @@ import (
deputils
"k8s.io/kubernetes/pkg/controller/deployment/util"
)
// Checks if cluster-independent, user provided data in two given Deployment are eq
au
l.
// Checks if cluster-independent, user provided data in two given Deployment are eq
ua
l.
// This function assumes that revisions are not kept in sync across the clusters.
func
DeploymentEquivalent
(
a
,
b
*
extensions_v1
.
Deployment
)
bool
{
if
a
.
Name
!=
b
.
Name
{
...
...
federation/pkg/federation-controller/util/eventsink/eventsink.go
View file @
85316762
...
...
@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/client/record"
)
// Implemnts k8s.io/kubernetes/pkg/client/record.EventSink.
// Implem
e
nts k8s.io/kubernetes/pkg/client/record.EventSink.
type
FederatedEventSink
struct
{
clientset
fedclientset
.
Interface
}
...
...
federation/pkg/federation-controller/util/federated_informer.go
View file @
85316762
...
...
@@ -79,7 +79,7 @@ type FederationView interface {
// GetUnreadyClusters returns a list of all clusters that are not ready yet.
GetUnreadyClusters
()
([]
*
federationapi
.
Cluster
,
error
)
// GetReadyClusers returns all clusters for which the sub-informers are run.
// GetReadyClus
t
ers returns all clusters for which the sub-informers are run.
GetReadyClusters
()
([]
*
federationapi
.
Cluster
,
error
)
// GetReadyCluster returns the cluster with the given name, if found.
...
...
@@ -337,7 +337,7 @@ func (f *federatedInformerImpl) GetUnreadyClusters() ([]*federationapi.Cluster,
return
result
,
nil
}
// GetReadyClusers returns all clusters for which the sub-informers are run.
// GetReadyClus
t
ers returns all clusters for which the sub-informers are run.
func
(
f
*
federatedInformerImpl
)
GetReadyClusters
()
([]
*
federationapi
.
Cluster
,
error
)
{
f
.
Lock
()
defer
f
.
Unlock
()
...
...
federation/pkg/federation-controller/util/planner/planner.go
View file @
85316762
...
...
@@ -58,12 +58,12 @@ func NewPlanner(preferences *fedapi.FederatedReplicaSetPreferences) *Planner {
// have all of the replicas assigned. In such case a cluster with higher weight has priority over
// cluster with lower weight (or with lexicographically smaller name in case of draw).
// It can also use the current replica count and estimated capacity to provide better planning and
// adhere to rebalance policy. To avoid prioritization of clusters with smaller lexico
no
graphical names
// adhere to rebalance policy. To avoid prioritization of clusters with smaller lexicographical names
// a semi-random string (like replica set name) can be provided.
// Two maps are returned:
// * a map that contains information how many replicas will be possible to run in a cluster.
// * a map that contains information how many extra replicas would be nice to schedule in a cluster so,
// if by chance, they are sche
ud
led we will be closer to the desired replicas layout.
// if by chance, they are sche
du
led we will be closer to the desired replicas layout.
func
(
p
*
Planner
)
Plan
(
replicasToDistribute
int64
,
availableClusters
[]
string
,
currentReplicaCount
map
[
string
]
int64
,
estimatedCapacity
map
[
string
]
int64
,
replicaSetKey
string
)
(
map
[
string
]
int64
,
map
[
string
]
int64
)
{
...
...
@@ -140,7 +140,7 @@ func (p *Planner) Plan(replicasToDistribute int64, availableClusters []string, c
modified
:=
true
// It is possible single pass of the loop is not enough to distribue all replicas among clusters due
// It is possible single pass of the loop is not enough to distribu
t
e all replicas among clusters due
// to weight, max and rounding corner cases. In such case we iterate until either
// there is no replicas or no cluster gets any more replicas or the number
// of attempts is less than available cluster count. If there is no preallocated pods
...
...
federation/pkg/federation-controller/util/secret.go
View file @
85316762
...
...
@@ -22,7 +22,7 @@ import (
api_v1
"k8s.io/kubernetes/pkg/api/v1"
)
// Checks if cluster-independent, user provided data in two given Secrets are eq
au
l. If in
// Checks if cluster-independent, user provided data in two given Secrets are eq
ua
l. If in
// the future the Secret structure is expanded then any field that is not populated.
// by the api server should be included here.
func
SecretEquivalent
(
s1
,
s2
api_v1
.
Secret
)
bool
{
...
...
federation/pkg/federation-controller/util/test/test_helper.go
View file @
85316762
...
...
@@ -40,7 +40,7 @@ const (
pushTimeout
=
5
*
time
.
Second
)
// A structure that distributes event
e
s to multiple watchers.
// A structure that distributes events to multiple watchers.
type
WatcherDispatcher
struct
{
sync
.
Mutex
watchers
[]
*
watch
.
RaceFreeFakeWatcher
...
...
@@ -272,10 +272,10 @@ func CompareObjectMeta(a, b apiv1.ObjectMeta) error {
return
fmt
.
Errorf
(
"Different name expected:%s observed:%s"
,
a
.
Namespace
,
b
.
Namespace
)
}
if
!
reflect
.
DeepEqual
(
a
.
Labels
,
b
.
Labels
)
&&
(
len
(
a
.
Labels
)
!=
0
||
len
(
b
.
Labels
)
!=
0
)
{
return
fmt
.
Errorf
(
"Labels are different expected:%v observe
r
d:%v"
,
a
.
Labels
,
b
.
Labels
)
return
fmt
.
Errorf
(
"Labels are different expected:%v observed:%v"
,
a
.
Labels
,
b
.
Labels
)
}
if
!
reflect
.
DeepEqual
(
a
.
Annotations
,
b
.
Annotations
)
&&
(
len
(
a
.
Annotations
)
!=
0
||
len
(
b
.
Annotations
)
!=
0
)
{
return
fmt
.
Errorf
(
"Annotations are different expected:%v observe
r
d:%v"
,
a
.
Annotations
,
b
.
Annotations
)
return
fmt
.
Errorf
(
"Annotations are different expected:%v observed:%v"
,
a
.
Annotations
,
b
.
Annotations
)
}
return
nil
}
...
...
federation/pkg/kubefed/init/init.go
View file @
85316762
...
...
@@ -199,7 +199,7 @@ func initFederation(cmdOut io.Writer, config util.AdminConfig, cmd *cobra.Comman
}
// Since only one IP address can be specified as advertise address,
// we arbitrarily pick the first availabe IP address
// we arbitrarily pick the first availab
l
e IP address
advertiseAddress
:=
""
if
len
(
ips
)
>
0
{
advertiseAddress
=
ips
[
0
]
...
...
federation/pkg/kubefed/util/util.go
View file @
85316762
...
...
@@ -115,7 +115,7 @@ func CreateKubeconfigSecret(clientset *client.Clientset, kubeconfig *clientcmdap
return
nil
,
err
}
// Build the secret object with the mini
fi
ed and flattened
// Build the secret object with the mini
miz
ed and flattened
// kubeconfig content.
secret
:=
&
api
.
Secret
{
ObjectMeta
:
api
.
ObjectMeta
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment