Skip to content
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

Adding a infra CLI command to get the prombench service endpoints #436

Closed
wants to merge 2 commits into from
Closed

Adding a infra CLI command to get the prombench service endpoints #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd46226
Adding infra CLI to get services of prombench
imrajdas Sep 5, 2020
475d368
Merge remote-tracking branch 'upstream/master' into infra-cli-kind-se…
imrajdas Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions infra/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ Commands:

kind info
kind info -v hashStable:COMMIT1 -v hashTesting:COMMIT2

kind services
kind services

kind cluster create
kind cluster create -f File -v PR_NUMBER:$PR_NUMBER -v
Expand Down
4 changes: 4 additions & 0 deletions infra/infra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ func main() {
k8sKIND.Command("info", "kind info -v hashStable:COMMIT1 -v hashTesting:COMMIT2").
Action(k.GetDeploymentVars)

k8sKIND.Command("services", "kind services").
Action(k.NewK8sProvider).
Action(k.GetKINDService)

//Cluster operations.
k8sKINDCluster := k8sKIND.Command("cluster", "manage KIND clusters").
Action(k.KINDDeploymentsParse)
Expand Down
76 changes: 38 additions & 38 deletions pkg/provider/k8s/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ type Resource struct {

// K8s holds the fields used to generate API request from within a cluster.
type K8s struct {
clt *kubernetes.Clientset
Clt *kubernetes.Clientset
ApiExtClient *apiServerExtensionsClient.Clientset
// DeploymentFiles files provided from the cli.
DeploymentFiles []string
Expand Down Expand Up @@ -96,7 +96,7 @@ func New(ctx context.Context, config *clientcmdapi.Config) (*K8s, error) {

return &K8s{
ctx: ctx,
clt: clientset,
Clt: clientset,
ApiExtClient: apiExtClientset,
DeploymentVars: make(map[string]string),
}, nil
Expand Down Expand Up @@ -251,7 +251,7 @@ func (c *K8s) clusterRoleApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().ClusterRoles()
client := c.Clt.RbacV1().ClusterRoles()

list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
Expand Down Expand Up @@ -291,7 +291,7 @@ func (c *K8s) clusterRoleBindingApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().ClusterRoleBindings()
client := c.Clt.RbacV1().ClusterRoleBindings()
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -334,7 +334,7 @@ func (c *K8s) configMapApply(resource runtime.Object) error {
switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":

client := c.clt.CoreV1().ConfigMaps(req.Namespace)
client := c.Clt.CoreV1().ConfigMaps(req.Namespace)

list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
Expand Down Expand Up @@ -377,7 +377,7 @@ func (c *K8s) daemonSetApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().DaemonSets(req.Namespace)
client := c.Clt.AppsV1().DaemonSets(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -419,7 +419,7 @@ func (c *K8s) deploymentApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().Deployments(req.Namespace)
client := c.Clt.AppsV1().Deployments(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -465,7 +465,7 @@ func (c *K8s) statefulSetApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().StatefulSets(req.Namespace)
client := c.Clt.AppsV1().StatefulSets(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -511,7 +511,7 @@ func (c *K8s) jobApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.BatchV1().Jobs(req.Namespace)
client := c.Clt.BatchV1().Jobs(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -597,7 +597,7 @@ func (c *K8s) ingressApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1beta1":
client := c.clt.ExtensionsV1beta1().Ingresses(req.Namespace)
client := c.Clt.ExtensionsV1beta1().Ingresses(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -636,7 +636,7 @@ func (c *K8s) nameSpaceApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Namespaces()
client := c.Clt.CoreV1().Namespaces()
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -679,7 +679,7 @@ func (c *K8s) roleApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().Roles(req.Namespace)
client := c.Clt.RbacV1().Roles(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -721,7 +721,7 @@ func (c *K8s) roleBindingApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().RoleBindings(req.Namespace)
client := c.Clt.RbacV1().RoleBindings(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -763,7 +763,7 @@ func (c *K8s) serviceAccountApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().ServiceAccounts(req.Namespace)
client := c.Clt.CoreV1().ServiceAccounts(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -805,7 +805,7 @@ func (c *K8s) serviceApply(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Services(req.Namespace)
client := c.Clt.CoreV1().Services(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -858,7 +858,7 @@ func (c *K8s) secretApply(resource runtime.Object) error {
}
switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Secrets(req.Namespace)
client := c.Clt.CoreV1().Secrets(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -899,7 +899,7 @@ func (c *K8s) persistentVolumeClaimApply(resource runtime.Object) error {
}
switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().PersistentVolumeClaims(req.Namespace)
client := c.Clt.CoreV1().PersistentVolumeClaims(req.Namespace)
list, err := client.List(c.ctx, apiMetaV1.ListOptions{})
if err != nil {
return errors.Wrapf(err, "error listing resource : %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -939,7 +939,7 @@ func (c *K8s) clusterRoleDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().ClusterRoles()
client := c.Clt.RbacV1().ClusterRoles()
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -957,7 +957,7 @@ func (c *K8s) clusterRoleBindingDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().ClusterRoleBindings()
client := c.Clt.RbacV1().ClusterRoleBindings()
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -977,7 +977,7 @@ func (c *K8s) configMapDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().ConfigMaps(req.Namespace)
client := c.Clt.CoreV1().ConfigMaps(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -998,7 +998,7 @@ func (c *K8s) daemonsetDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().DaemonSets(req.Namespace)
client := c.Clt.AppsV1().DaemonSets(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1019,7 +1019,7 @@ func (c *K8s) deploymentDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().Deployments(req.Namespace)
client := c.Clt.AppsV1().Deployments(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1040,7 +1040,7 @@ func (c *K8s) statefulSetDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().StatefulSets(req.Namespace)
client := c.Clt.AppsV1().StatefulSets(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1061,7 +1061,7 @@ func (c *K8s) jobDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.BatchV1().Jobs(req.Namespace)
client := c.Clt.BatchV1().Jobs(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand Down Expand Up @@ -1104,7 +1104,7 @@ func (c *K8s) ingressDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1beta1":
client := c.clt.ExtensionsV1beta1().Ingresses(req.Namespace)
client := c.Clt.ExtensionsV1beta1().Ingresses(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1122,7 +1122,7 @@ func (c *K8s) namespaceDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Namespaces()
client := c.Clt.CoreV1().Namespaces()
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1146,7 +1146,7 @@ func (c *K8s) roleDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().Roles(req.Namespace)
client := c.Clt.RbacV1().Roles(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1167,7 +1167,7 @@ func (c *K8s) roleBindingDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.RbacV1().RoleBindings(req.Namespace)
client := c.Clt.RbacV1().RoleBindings(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1188,7 +1188,7 @@ func (c *K8s) serviceDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Services(req.Namespace)
client := c.Clt.CoreV1().Services(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1209,7 +1209,7 @@ func (c *K8s) serviceAccountDelete(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().ServiceAccounts(req.Namespace)
client := c.Clt.CoreV1().ServiceAccounts(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1229,7 +1229,7 @@ func (c *K8s) secretDelete(resource runtime.Object) error {
}
switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Secrets(req.Namespace)
client := c.Clt.CoreV1().Secrets(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1249,7 +1249,7 @@ func (c *K8s) persistentVolumeClaimDelete(resource runtime.Object) error {
}
switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().PersistentVolumeClaims(req.Namespace)
client := c.Clt.CoreV1().PersistentVolumeClaims(req.Namespace)
delPolicy := apiMetaV1.DeletePropagationForeground
if err := client.Delete(c.ctx, req.Name, apiMetaV1.DeleteOptions{PropagationPolicy: &delPolicy}); err != nil {
return errors.Wrapf(err, "resource delete failed - kind: %v, name: %v", kind, req.Name)
Expand All @@ -1270,7 +1270,7 @@ func (c *K8s) serviceExists(resource runtime.Object) (bool, error) {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Services(req.Namespace)
client := c.Clt.CoreV1().Services(req.Namespace)
res, err := client.Get(c.ctx, req.Name, apiMetaV1.GetOptions{})
if err != nil {
return false, errors.Wrapf(err, "Checking Service resource status failed")
Expand Down Expand Up @@ -1310,7 +1310,7 @@ func (c *K8s) deploymentReady(resource runtime.Object) (bool, error) {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().Deployments(req.Namespace)
client := c.Clt.AppsV1().Deployments(req.Namespace)

res, err := client.Get(c.ctx, req.Name, apiMetaV1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -1339,7 +1339,7 @@ func (c *K8s) statefulSetReady(resource runtime.Object) (bool, error) {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().StatefulSets(req.Namespace)
client := c.Clt.AppsV1().StatefulSets(req.Namespace)

res, err := client.Get(c.ctx, req.Name, apiMetaV1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -1368,7 +1368,7 @@ func (c *K8s) jobReady(resource runtime.Object) (bool, error) {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.BatchV1().Jobs(req.Namespace)
client := c.Clt.BatchV1().Jobs(req.Namespace)

res, err := client.Get(c.ctx, req.Name, apiMetaV1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -1399,7 +1399,7 @@ func (c *K8s) daemonsetReady(resource runtime.Object) error {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.AppsV1().DaemonSets(req.Namespace)
client := c.Clt.AppsV1().DaemonSets(req.Namespace)

res, err := client.Get(c.ctx, req.Name, apiMetaV1.GetOptions{})
if err != nil {
Expand All @@ -1420,7 +1420,7 @@ func (c *K8s) namespaceDeleted(resource runtime.Object) (bool, error) {

switch v := resource.GetObjectKind().GroupVersionKind().Version; v {
case "v1":
client := c.clt.CoreV1().Namespaces()
client := c.Clt.CoreV1().Namespaces()

if _, err := client.Get(c.ctx, req.Name, apiMetaV1.GetOptions{}); err != nil {
if apiErrors.IsNotFound(err) {
Expand Down
Loading