Skip to content

Refactor cluster registry to use Secret to store kubeconf #4706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 11, 2018
Merged

Refactor cluster registry to use Secret to store kubeconf #4706

merged 1 commit into from
Apr 11, 2018

Conversation

sbezverk
Copy link
Contributor

@sbezverk sbezverk commented Apr 3, 2018

4th attempt to resolve Circle CI stuck on Waiting for status to be reported issue.

This PR refactors cluster registry to use k8s Secret object to store kubeconf files of member clusters.

apiVersion: v1
kind: ConfigMap
metadata:
  name: clusterregistry
  namespace: istio-system
data:
  kube-3.yaml: |-
    apiVersion: clusterregistry.k8s.io/v1alpha1
    kind: Cluster
    metadata:
      name: "kube-3"
      annotations:
        config.istio.io/pilotEndpoint: "192.168.80.234:9080"
        config.istio.io/platform: "Kubernetes"
        config.istio.io/pilotCfgStore: True
        config.istio.io/accessConfigSecret: "kube-3.conf"   < ---   Name of Secret which stores kube-3 kubeconf config 
        config.istio.io/accessConfigSecretNamespace: "istio-system"   < ---   Namespace where secrets will be stored.

@sbezverk
Copy link
Contributor Author

sbezverk commented Apr 3, 2018

/test istio-pilot-e2e

@costinm costinm self-requested a review April 3, 2018 17:59
costinm
costinm approved these changes Apr 3, 2018
View reviewed changes
Copy link
Contributor

@costinm costinm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already reviewed previous version, still approved.

@costinm costinm closed this Apr 3, 2018
@costinm costinm reopened this Apr 3, 2018
@codecov
Copy link

codecov bot commented Apr 3, 2018 •
edited
Loading

Codecov Report

Merging #4706 into master will increase coverage by 1%.
The diff coverage is 32%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #4706    +/-   ##
=======================================
+ Coverage      75%     75%    +1%     
=======================================
  Files         296     297     +1     
  Lines       24630   25017   +387     
=======================================
+ Hits        18293   18605   +312     
- Misses       5577    5645    +68     
- Partials      760     767     +7
Impacted Files Coverage Δ
pilot/pkg/bootstrap/server.go 40% <0%> (+1%) ⬆️
pilot/pkg/serviceregistry/kube/client.go 27% <34%> (-2%) ⬇️
pilot/pkg/config/clusterregistry/conversion.go 40% <36%> (-22%) ⬇️
mixer/adapter/kubernetesenv/cache.go 83% <0%> (-2%) ⬇️
mixer/adapter/kubernetesenv/kubernetesenv.go 68% <0%> (-2%) ⬇️
mixer/adapter/servicecontrol/utils.go 90% <0%> (-1%) ⬇️
mixer/adapter/statsd/statsd.go 96% <0%> (-1%) ⬇️
mixer/adapter/circonus/circonus.go 71% <0%> (ø) ⬇️
pilot/pkg/model/controller.go 100% <0%> (ø) ⬆️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 21b69bb...a0f24bb. Read the comment docs.

@sbezverk
Copy link
Contributor Author

sbezverk commented Apr 3, 2018

/hold

@istio-testing istio-testing added the do-not-merge/hold Block automatic merging of a PR. label Apr 3, 2018
This was referenced Apr 6, 2018
Closed
Closed
Merged
@sbezverk
Copy link
Contributor Author

/hold cancel

@istio-testing istio-testing removed the do-not-merge/hold Block automatic merging of a PR. label Apr 11, 2018
rshriram
rshriram reviewed Apr 11, 2018
View reviewed changes
pilot/pkg/config/clusterregistry/clusterregistry.gotmpl
metadata:
name: {{.Name}}
annotations:
config.istio.io/pilotEndpoint: "{{.PilotIP}}:9080"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make the port configurable as well. 9080 is for old v1 stuff.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file is ONLY used in unit testing, so no any exposure to any inside or outside service.

costinm
costinm reviewed Apr 11, 2018
View reviewed changes
Copy link
Contributor

@costinm costinm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@istio-testing
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: costinm

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@costinm costinm merged commit f5208b5 into istio:master Apr 11, 2018
@ayj ayj mentioned this pull request Apr 11, 2018
Closed
@john-a-joyce john-a-joyce mentioned this pull request Apr 13, 2018
Merged
@sdake sdake mentioned this pull request Apr 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@costinm costinm costinm approved these changes

+1 more reviewer

@rshriram rshriram rshriram approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@costinm costinm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sbezverk @istio-testing @costinm @rshriram @googlebot