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
234fbfa6
Commit
234fbfa6
authored
Apr 23, 2019
by
jennybuckley
Committed by
Jennifer Buckley
Apr 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use semantic equality in client ca post start hook
parent
bd12b013
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
BUILD
pkg/master/BUILD
+1
-0
client_ca_hook.go
pkg/master/client_ca_hook.go
+2
-2
No files found.
pkg/master/BUILD
View file @
234fbfa6
...
@@ -104,6 +104,7 @@ go_library(
...
@@ -104,6 +104,7 @@ go_library(
"//staging/src/k8s.io/api/storage/v1:go_default_library",
"//staging/src/k8s.io/api/storage/v1:go_default_library",
"//staging/src/k8s.io/api/storage/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/storage/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
"//staging/src/k8s.io/api/storage/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
...
...
pkg/master/client_ca_hook.go
View file @
234fbfa6
...
@@ -19,10 +19,10 @@ package master
...
@@ -19,10 +19,10 @@ package master
import
(
import
(
"encoding/json"
"encoding/json"
"fmt"
"fmt"
"reflect"
"time"
"time"
corev1
"k8s.io/api/core/v1"
corev1
"k8s.io/api/core/v1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apierrors
"k8s.io/apimachinery/pkg/api/errors"
apierrors
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
...
@@ -132,7 +132,7 @@ func writeConfigMap(client corev1client.ConfigMapsGetter, name string, data map[
...
@@ -132,7 +132,7 @@ func writeConfigMap(client corev1client.ConfigMapsGetter, name string, data map[
return
err
return
err
}
}
if
!
reflect
.
DeepEqual
(
existing
.
Data
,
data
)
{
if
!
apiequality
.
Semantic
.
DeepEqual
(
existing
.
Data
,
data
)
{
existing
.
Data
=
data
existing
.
Data
=
data
_
,
err
=
client
.
ConfigMaps
(
metav1
.
NamespaceSystem
)
.
Update
(
existing
)
_
,
err
=
client
.
ConfigMaps
(
metav1
.
NamespaceSystem
)
.
Update
(
existing
)
}
}
...
...
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