Skip to content

Commit 60012ce

Browse files
committed
Merge branch 'develop' into create-cm-on-cluster-action-oss
2 parents bb12ab9 + 23570cc commit 60012ce

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Note: We have restrucutred the readme. If you are looking for Devtron's CI/CD capabilites, please [click here](#devtron-platform)
1+
Note: We have restructured the readme. If you are looking for Devtron's CI/CD capabilities, please [click here](#devtron-platform)
22
#
33

44
<p align="center">
@@ -43,7 +43,7 @@ Note: We have restrucutred the readme. If you are looking for Devtron's CI/CD ca
4343
Devtron's **extensible Kubernetes Dashboard** provides clear visibility into your Kubernetes clusters and streamlines Helm app management through a single, intuitive interface.<br>
4444
With built-in RBAC, it ensures secure access while offering integrated insights into workloads deployed via GitOps tools like **ArgoCD** and **FluxCD** across multiple clusters. Devtron creates a centralized DevOps hub, accelerating operations by up to 20x :rocket:
4545

46-
Check out the below video to experince the full power of the **Kubernetes Dashboard**.
46+
Check out the below video to experience the full power of the **Kubernetes Dashboard**.
4747

4848
<a href="https://youtu.be/oqCAB9b-SGQ?si=YoUJfHL43VXRU5wx">
4949
<br>
@@ -65,9 +65,9 @@ Devtron's Kubernetes Dashboard offers a variety of different features, giving yo
6565
### Features 🤩
6666

6767
- Simplified configuration and management for Helm applications with easy rollback
68-
- Compare and reconcile configuration drifts across enviornments
69-
- Manage Helm deployments to multiple Kubernetes enviornments
70-
- A single pane of glass for Helm, ArgoCD and FluxCD applications across multiple clusters
68+
- Compare and reconcile configuration drifts across environments
69+
- Manage Helm deployments to multiple Kubernetes environments
70+
- A single pane of glass for Helm, ArgoCD, and FluxCD applications across multiple clusters
7171
- Centralized Dashboard to view and manage K8s resources across multiple clusters
7272
- Comprehensive SSO and RBAC to ensure secure dashboard access for team collaboration
7373

@@ -111,16 +111,11 @@ For Devtron version less than v0.6.0, run the following command to get the admin
111111
kubectl -n devtroncd get secret devtron-secret -o jsonpath='{.data.ACD_PASSWORD}' | base64 -d
112112
```
113113

114-
115114
Please refer to the document for more information on how to [access the Devtron Dashboard](https://docs.dashboard.devtron.ai/getting-started/install-devtron-dashboard).
116115

117-
### Install Multi-Architecture Nodes (ARM and AMD)
118-
119-
To install Devtron on clusters with the multi-architecture nodes (ARM and AMD), append the Devtron installation command with ```--set installer.arch=multi-arch```
120-
121116
## Devtron Platform
122117

123-
The Devtron Platform provides a complete solution for all DevOps requirements, helping to create a single centrailzed DevOps Platform for managing all applications across Kubernetes clusters. <br>
118+
The Devtron Platform provides a complete solution for all DevOps requirements, helping to create a single centralized DevOps Platform for managing all applications across Kubernetes clusters. <br>
124119

125120
With Devtron Platform, you can accelerate your application delivery lifecycle by leveraging advanced features like canary deployments, A/B testing, and automated rollbacks. Devtron Platform helps you achieve faster time-to-market and improved application reliability by simplifying Kubernetes operations and streamlining development workflows.
126121

cmd/external-app/wire.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import (
7474
repository4 "github.com/devtron-labs/devtron/pkg/appStore/chartGroup/repository"
7575
deployment2 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode/deployment"
7676
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deployment"
77+
"github.com/devtron-labs/devtron/pkg/asyncProvider"
7778
"github.com/devtron-labs/devtron/pkg/attributes"
7879
"github.com/devtron-labs/devtron/pkg/build/git/gitMaterial"
7980
"github.com/devtron-labs/devtron/pkg/commonService"
@@ -152,6 +153,7 @@ func InitializeApp() (*App, error) {
152153
grafana.GetGrafanaClientConfig,
153154
grafana.NewGrafanaClientImpl,
154155
wire.Bind(new(grafana.GrafanaClient), new(*grafana.GrafanaClientImpl)),
156+
asyncProvider.WireSet,
155157

156158
commonEnforcementFunctionsUtil.NewCommonEnforcementUtilImpl,
157159
wire.Bind(new(commonEnforcementFunctionsUtil.CommonEnforcementUtil), new(*commonEnforcementFunctionsUtil.CommonEnforcementUtilImpl)),

cmd/external-app/wire_gen.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/workflow/status/WorkflowStatusService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ func (impl *WorkflowStatusServiceImpl) UpdatePipelineTimelineAndStatusByLiveAppl
320320
}
321321
dc, err := impl.deploymentConfigService.GetConfigForHelmApps(installedApp.AppId, installedApp.EnvironmentId)
322322
if err != nil {
323-
impl.logger.Errorw("error, GetConfigForDevtronApps", "appId", pipeline.AppId, "environmentId", pipeline.EnvironmentId, "err", err)
323+
impl.logger.Errorw("error, GetConfigForDevtronApps", "appId", installedApp.AppId, "environmentId", installedApp.EnvironmentId, "err", err)
324324
return nil, isTimelineUpdated
325325
}
326326
applicationObjectClusterId := dc.GetApplicationObjectClusterId()

0 commit comments

Comments
 (0)