[opsportal] Cleanup kommander/opsportal charts #376

juliangieseke · 2020-01-22T11:54:30Z

this commit cleans up kommander and opsportal charts in a way that we only have kommander related addons in kommander chart and ops portal only consists of what is included in konvoy.

see comments in changed code fore more info

next step will be to actually remove UI parts from both charts and make it its own kubeaddon

juliangieseke · 2020-01-22T11:55:56Z

stable/kommander/values.yaml

@@ -1,52 +1,3 @@
-kommander-ui:


this part is replaced with values.yaml in kommander repo: https://github.com/mesosphere/kommander/blob/master/chart/kommander-ui/values.yaml

stable/opsportal/requirements.yaml

juliangieseke · 2020-01-22T11:58:25Z

stable/opsportal/values.yaml

-#  Konvoy UI
-###############################################################################
-kommander:
+kommander-ui:


removing/replacing values from full fledged kommander to only kommander ui.

juliangieseke · 2020-01-22T17:44:08Z

@alejandroEsc @jimmidyson @joejulian @hectorj2f I've started again with splitting up our charts so that we have opsportal only containing konvoy related stuff and only depending on UI, not whole of kommander. would appreciate some eyes on this, checking if I missed something. 🙇

juliangieseke · 2020-01-22T18:01:50Z

also cc @samba

alejandroEsc

Looks good so far, can we get some deployment output?

juliangieseke · 2020-01-23T11:32:37Z

opsportal worked fine, heres the output:

➜  opsportal git:(jg/cleanup-kommander-opsportal-charts) helm install .
NAME:   viable-numbat
LAST DEPLOYED: Thu Jan 23 12:06:50 2020
NAMESPACE: default
STATUS: DEPLOYED

RESOURCES:
==> v1/ClusterRoleBinding
NAME                        AGE
viable-numbat-kommander-ui  1s

==> v1/ConfigMap
NAME                    AGE
opsportal-landing-conf  1s
opsportal-landing-html  1s

==> v1/Deployment
NAME                        AGE
opsportal-landing           1s
viable-numbat-kommander-ui  1s

==> v1/Pod(related)
NAME                                         AGE
opsportal-landing-5cc7d766dd-cpdpq           1s
viable-numbat-kommander-ui-86d89d7848-f8c9w  1s

==> v1/Service
NAME               AGE
opsportal          1s
opsportal-landing  1s

==> v1beta1/Ingress
NAME                            AGE
opsportal-landing               1s
viable-numbat-kommander-ui      1s
viable-numbat-opsportal-addons  1s

kommander caused some trouble which doesnt seem to be related, but that I'd like to understand… will post an update once I know whats going on (kommander-system namespace seems to be stuck in terminating phase on my cluster)

edit: ref on kommander issue: https://mesosphere.slack.com/archives/CJQURP1FT/p1579780553002300

stable/kommander/Chart.yaml

stable/opsportal/Chart.yaml

stable/opsportal/requirements.yaml

juliangieseke · 2020-01-23T16:49:54Z

this has 2 approvals already, @makkes are your questions answered? would like to merge :)

makkes · 2020-01-24T08:47:36Z

this has 2 approvals already, @makkes are your questions answered? would like to merge :)

I'd prefer us to test the chart before merging. On it.

juliangieseke · 2020-01-24T10:59:44Z

started konvoy cluster with kommander disabled and manually installed afterwards, worked

➜  kommander git:(jg/cleanup-kommander-opsportal-charts) ✗ helm install . --set kommander-cluster-lifecycle.certificates.issuer.selfSigned=true --name kommander
NAME:   kommander
LAST DEPLOYED: Fri Jan 24 11:55:45 2020
NAMESPACE: default
STATUS: DEPLOYED

RESOURCES:
==> v1/ClusterRole
NAME                                AGE
kcl-addon-update-watcher            8s
kcl-admin                           8s
kcl-cm                              8s
kcl-edit                            8s
kcl-rbac-proxy                      8s
kcl-tfcb                            8s
kcl-view                            8s
kcl-webhook                         8s
kommander-grafana-clusterrole       8s
kommander-kubeaddons-catalog        8s
kubefed-role                        8s
system:kubefed:admission-requester  8s

==> v1/ClusterRoleBinding
NAME                                      AGE
kcl-addon-update-watcher                  8s
kcl-cm                                    8s
kcl-rbac-proxy                            8s
kcl-tfcb                                  8s
kcl-webhook                               8s
kcl-webhook:auth-delegator                8s
kommander-grafana-clusterrolebinding      8s
kommander-kommander-ui                    8s
kommander-kubeaddons-catalog              8s
kubefed-admission-webhook:anonymous-auth  8s
kubefed-admission-webhook:auth-delegator  8s
kubefed-rolebinding                       8s

==> v1/ConfigMap
NAME                                        AGE
kommander-grafana                           8s
kommander-grafana-config-dashboards         8s
kommander-grafana-test                      8s
kommander-k8s-resources-clusters-dashboard  8s
kommander-thanosquery-dashboard             8s

==> v1/Deployment
NAME                          AGE
kcl-cm                        8s
kcl-tfcb                      8s
kcl-utility-apiserver         8s
kcl-webhook                   8s
kommander-grafana             8s
kommander-karma               8s
kommander-kommander-ui        8s
kommander-kubeaddons-catalog  8s
kommander-thanos-query        8s
kubefed-admission-webhook     8s
kubefed-controller-manager    8s

==> v1/Namespace
NAME              AGE
kommander-system  8s

==> v1/Pod(related)
NAME                                           AGE
kcl-cm-6c8ddd54c4-zfx9j                        8s
kcl-tfcb-7d54866976-28pnv                      8s
kcl-utility-apiserver-d58df64f7-jn5gx          8s
kcl-webhook-68f76c8ddb-z4nmh                   8s
kommander-grafana-66ccc6f8d6-grr5z             8s
kommander-karma-595f96c94b-9sbhn               8s
kommander-kommander-ui-7d879db87c-zbswl        7s
kommander-kubeaddons-catalog-6789fbdcdd-8shkc  8s
kommander-thanos-query-55f4c5b97b-k444r        8s
kubefed-admission-webhook-554b6bc659-r8ts9     8s
kubefed-controller-manager-64b4d7ddb5-cnhfp    8s
kubefed-controller-manager-64b4d7ddb5-gplr2    8s

==> v1/ResourceQuota
NAME                     AGE
one-license-per-cluster  8s

==> v1/Role
NAME                            AGE
kcl-leader-election             8s
kommander-grafana-test          8s
kubefed-admission-webhook-role  8s
kubefed-config-role             8s

==> v1/RoleBinding
NAME                                           AGE
kcl-leader-election                            8s
kcl-webhook:authentication-reader              8s
kommander-grafana-test                         8s
kubefed-admission-webhook-rolebinding          8s
kubefed-admission-webhook:apiextension-viewer  8s
kubefed-config-rolebinding                     8s

==> v1/Secret
NAME                                    AGE
kommander-grafana                       8s
kommander-karma-client-tls              8s
kommander-thanos-client-tls             8s
kubefed-admission-webhook-serving-cert  8s

==> v1/Service
NAME                          AGE
kcl-cm-metrics                8s
kcl-tfcb                      8s
kcl-utility-apiserver         8s
kcl-webhook                   8s
kommander                     8s
kommander-grafana             8s
kommander-karma               8s
kommander-kubeaddons-catalog  8s
kommander-thanos-query-grpc   8s
kommander-thanos-query-http   8s
kubefed-admission-webhook     8s

==> v1/ServiceAccount
NAME                       AGE
kcl-addon-update-watcher   8s
kcl-cm                     8s
kcl-tfcb                   8s
kcl-webhook                8s
kommander-grafana          8s
kommander-grafana-test     8s
kommander-karma            8s
kubefed-admission-webhook  8s
kubefed-controller         8s

==> v1alpha1/Certificate
NAME                       AGE
kcl-tfcb-tls               8s
kcl-utility-apiserver-tls  8s
kcl-webhook-tls            8s

==> v1alpha1/Issuer
NAME            AGE
kcl-selfsigned  7s

==> v1beta1/APIService
NAME                                     AGE
v1beta1.webhook.kommander.mesosphere.io  8s

==> v1beta1/CronJob
NAME                      AGE
kcl-addon-update-watcher  8s

==> v1beta1/FederatedAddon
NAME                                  AGE
dashboard-kommander-override          8s
kommander-kommander-karma-proxy       8s
kommander-kommander-thanos-proxy      8s
kube-oidc-proxy-kommander             8s
opsportal-addons-kommander-overrides  8s
traefik-forward-auth-kommander        8s

==> v1beta1/FederatedClusterRole
NAME                     AGE
kommander-admin          8s
kommander-cluster-admin  8s
kommander-edit           8s
kommander-view           8s

==> v1beta1/FederatedClusterRoleBinding
NAME                                                 AGE
kubeaddons-controller-manager-cluster-admin-binding  7s
ops-portal-user-kommander                            7s

==> v1beta1/FederatedCustomResourceDefinition
NAME                                    AGE
addons.kubeaddons.mesosphere.io         7s
clusteraddons.kubeaddons.mesosphere.io  7s

==> v1beta1/FederatedDeployment
NAME                           AGE
kubeaddons-controller-manager  7s

==> v1beta1/FederatedNamespace
NAME              AGE
kommander-system  7s
kubeaddons        7s

==> v1beta1/FederatedSecret
NAME                                   AGE
kommander-kommander-karma-server-tls   7s
kommander-kommander-thanos-server-tls  7s

==> v1beta1/FederatedServiceAccount
NAME                           AGE
kubeaddons-controller-manager  7s

==> v1beta1/FederatedTypeConfig
NAME                                            AGE
addons.kubeaddons.mesosphere.io                 7s
addonsdeployments.kubeaddons.mesosphere.io      7s
clusteraddons.kubeaddons.mesosphere.io          7s
clusterrolebindings.rbac.authorization.k8s.io   7s
clusterroles.rbac.authorization.k8s.io          7s
configmaps                                      7s
customresourcedefinitions.apiextensions.k8s.io  7s
deployments.apps                                7s
ingresses.extensions                            7s
jobs.batch                                      7s
namespaces                                      7s
replicasets.apps                                7s
rolebindings.rbac.authorization.k8s.io          7s
roles.rbac.authorization.k8s.io                 7s
secrets                                         7s
serviceaccounts                                 7s
services                                        7s

==> v1beta1/Ingress
NAME                                  AGE
kommander-grafana                     8s
kommander-karma                       8s
kommander-kommander-ui                8s
kommander-kubeaddons-catalog-ingress  8s
kommander-thanos-query-http           8s

==> v1beta1/KubeFedConfig
NAME     AGE
kubefed  7s

==> v1beta1/MutatingWebhookConfiguration
NAME                      AGE
kcl-defaulting            7s
mutation.core.kubefed.io  7s

==> v1beta1/PodSecurityPolicy
NAME                    AGE
kommander-grafana       8s
kommander-grafana-test  8s

==> v1beta1/Role
NAME               AGE
kommander-grafana  8s

==> v1beta1/RoleBinding
NAME               AGE
kommander-grafana  8s

==> v1beta1/ValidatingWebhookConfiguration
NAME                         AGE
kcl-validating               7s
validations.core.kubefed.io  7s

juliangieseke · 2020-01-24T11:02:18Z

~~Kommander UI doesnt load… debugging…~~ was able to fix this by updating kommander charts, but found another issue with our UI. will investigate further on monday

juliangieseke · 2020-01-24T12:22:16Z

Steps to reproduce the issue:

in cluster.yaml, disable kommander plugin
konvoy up
helm delete --purge opsportal-kubeaddons
cd stable/opsportal on this branch
helm install . --namespace kubeaddons --name opsportal-kubeaddons
cd stable/kommander on this branch
helm install . --namespace kommander --name kommander --set kommander-cluster-lifecycle.certificates.issuer.selfSigned=true
verify that /ops/portal/kommander/ui/ works as expected
visit /ops/portal/ on your cluster - there should be Try Kommander beta badge, but its missing

I also tried killing opsportal-kommander-ui container (maybe it refreshed on start?) but that didnt help:
kubectl delete pod opsportal-kubeaddons-kommander-ui-<generated-part>

@brandonc I think you have some context around capability checking, if you got time today, can you have a look please?

this commit cleans up kommander and opsportal charts in a way that we only have kommander related addons in kommander chart and ops portal only consists of what is included in konvoy.

juliangieseke · 2020-01-29T16:02:38Z

apperantly its not enough to install kommander via helm, it has to be the kubeaddon, that is installed. so this PR should be good to go 🤷‍♂

makkes

I understand that we will live with this chart not being installable standalone. If that's correct, then I'll +1. @juliangieseke can you confirm?

juliangieseke · 2020-01-31T09:26:37Z

both charts, opsportal and kommander, should and do work standalone. my comment was related to UI feature detection which looks for the kommander clusteraddon being installed.

…l-charts [opsportal] Cleanup kommander/opsportal charts

juliangieseke changed the title ~~chore: cleanup kommander/opsportal charts~~ Cleanup kommander/opsportal charts Jan 22, 2020

juliangieseke commented Jan 22, 2020

View reviewed changes

juliangieseke force-pushed the jg/cleanup-kommander-opsportal-charts branch from 148cbc0 to 6ec2a3d Compare January 22, 2020 12:02

jimmidyson changed the base branch from dev to master January 22, 2020 17:40

alejandroEsc previously approved these changes Jan 22, 2020

View reviewed changes

alejandroEsc assigned juliangieseke Jan 22, 2020

alejandroEsc added the ready ready label Jan 22, 2020

alejandroEsc changed the title ~~Cleanup kommander/opsportal charts~~ [opsportal] Cleanup kommander/opsportal charts Jan 22, 2020

juliangieseke marked this pull request as ready for review January 23, 2020 11:32

juliangieseke requested a review from a team January 23, 2020 11:32

DanielMSchmidt previously approved these changes Jan 23, 2020

View reviewed changes

makkes reviewed Jan 23, 2020

View reviewed changes

stable/kommander/Chart.yaml Show resolved Hide resolved

stable/opsportal/Chart.yaml Outdated Show resolved Hide resolved

stable/opsportal/requirements.yaml Show resolved Hide resolved

juliangieseke added the do not merge label Jan 24, 2020

juliangieseke dismissed stale reviews from DanielMSchmidt and alejandroEsc via 5d085f7 January 24, 2020 12:15

juliangieseke force-pushed the jg/cleanup-kommander-opsportal-charts branch from 940f94e to 5d085f7 Compare January 24, 2020 12:15

chore: cleanup kommander/opsportal charts

e8e46f1

this commit cleans up kommander and opsportal charts in a way that we only have kommander related addons in kommander chart and ops portal only consists of what is included in konvoy.

juliangieseke force-pushed the jg/cleanup-kommander-opsportal-charts branch 2 times, most recently from 71916f7 to 7404172 Compare January 29, 2020 15:20

fix: update kommander-ui and chart

d511159

juliangieseke force-pushed the jg/cleanup-kommander-opsportal-charts branch from 7404172 to d511159 Compare January 29, 2020 16:01

juliangieseke removed the do not merge label Jan 29, 2020

DanielMSchmidt approved these changes Jan 30, 2020

View reviewed changes

Merge branch 'master' into jg/cleanup-kommander-opsportal-charts

252b0ee

makkes reviewed Jan 30, 2020

View reviewed changes

makkes approved these changes Jan 31, 2020

View reviewed changes

Merge branch 'master' into jg/cleanup-kommander-opsportal-charts

ff080e1

juliangieseke merged commit 764345f into master Jan 31, 2020

juliangieseke deleted the jg/cleanup-kommander-opsportal-charts branch January 31, 2020 11:54

mesosphere-teamcity pushed a commit that referenced this pull request Jan 31, 2020

Merge pull request #376 from mesosphere/jg/cleanup-kommander-opsporta…

003fca6

…l-charts [opsportal] Cleanup kommander/opsportal charts

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[opsportal] Cleanup kommander/opsportal charts #376

[opsportal] Cleanup kommander/opsportal charts #376

juliangieseke commented Jan 22, 2020 •

edited

Loading

juliangieseke Jan 22, 2020

juliangieseke Jan 22, 2020

juliangieseke commented Jan 22, 2020

juliangieseke commented Jan 22, 2020

alejandroEsc left a comment

juliangieseke commented Jan 23, 2020 •

edited

Loading

juliangieseke commented Jan 23, 2020

makkes commented Jan 24, 2020

juliangieseke commented Jan 24, 2020

juliangieseke commented Jan 24, 2020 •

edited

Loading

juliangieseke commented Jan 24, 2020 •

edited

Loading

juliangieseke commented Jan 29, 2020

makkes left a comment

juliangieseke commented Jan 31, 2020

[opsportal] Cleanup kommander/opsportal charts #376

[opsportal] Cleanup kommander/opsportal charts #376

Conversation

juliangieseke commented Jan 22, 2020 • edited Loading

juliangieseke Jan 22, 2020

Choose a reason for hiding this comment

juliangieseke Jan 22, 2020

Choose a reason for hiding this comment

juliangieseke commented Jan 22, 2020

juliangieseke commented Jan 22, 2020

alejandroEsc left a comment

Choose a reason for hiding this comment

juliangieseke commented Jan 23, 2020 • edited Loading

juliangieseke commented Jan 23, 2020

makkes commented Jan 24, 2020

juliangieseke commented Jan 24, 2020

juliangieseke commented Jan 24, 2020 • edited Loading

juliangieseke commented Jan 24, 2020 • edited Loading

juliangieseke commented Jan 29, 2020

makkes left a comment

Choose a reason for hiding this comment

juliangieseke commented Jan 31, 2020

juliangieseke commented Jan 22, 2020 •

edited

Loading

juliangieseke commented Jan 23, 2020 •

edited

Loading

juliangieseke commented Jan 24, 2020 •

edited

Loading

juliangieseke commented Jan 24, 2020 •

edited

Loading