ArrisLee f3b8a9dc85 resolve conflicts

2021-09-06 17:00:41 +12:00

..

access_test.go

fix(namespace): update portainer-config when delete a namespace (#5330)

2021-07-20 14:05:31 +12:00

access.go

feat(k8s): Introduce the ability to restrict access to default namespace (EE-745) (#5337)

2021-07-23 17:10:46 +12:00

client.go

feat(kube): kube app auto update backend (#5547)

2021-08-31 16:12:51 +12:00

exec.go

fix(kubectl/shell): zombie pods and websocket connection error bugfixes EE-1520 (#5562)

2021-09-03 13:11:11 +12:00

kubeconfig_test.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

kubeconfig.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

namespace_test.go

feat(k8s/resource-pool): add the ability to mark/unmark resource pool as system (#5360)

2021-08-26 16:00:59 +02:00

namespace.go

feat(k8s/resource-pool): add the ability to mark/unmark resource pool as system (#5360)

2021-08-26 16:00:59 +02:00

naming.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

nodes_limits_test.go

feat(k8s): review the resource assignement when creating a kubernetes application EE-437 (#5254)

2021-09-01 09:08:01 +12:00

nodes_limits.go

feat(k8s): review the resource assignement when creating a kubernetes application EE-437 (#5254)

2021-09-01 09:08:01 +12:00

pod_test.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

pod.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

registries.go

feat(app): rework private registries and support private registries in kubernetes EE-30 (#5131)

2021-07-14 21:15:21 +12:00

resource_test.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

resource.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

role.go

feat(rbac) remove list ingresses permissions EE-1304 (#5458)

2021-09-01 09:43:11 +12:00

secret.go

feat(k8s): use instance ID to create unique k8s resources (#4196)

2020-08-12 17:10:28 +12:00

service_account_test.go

feat(kubernetes/shell): kubectl web shell and kubeconfig functionality EE-448 (#5229)

2021-08-05 15:02:06 +12:00

service_account.go

feat(rbac) remove list ingresses permissions EE-1304 (#5458)

2021-09-01 09:43:11 +12:00