[go: nahoru, domu]
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

Jump to bottom

feat: removed inception dependency for installation. #3228

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open

feat: removed inception dependency for installation. #3228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f0ee18f
changes in inception
jatin-jangir Apr 3, 2023
d0debb0
added kubewatch.yaml in templates
jatin-jangir Apr 3, 2023
883cbee
add the kubewatch.yaml
jatin-jangir Apr 3, 2023
e82aad8
Merge branch 'devtron-labs:main' into remove-kubewatch
jatin-jangir Apr 3, 2023
d10d676
add resources in kubewatch.yaml
jatin-jangir Apr 3, 2023
6ed767c
removed apply command for kubewatch
jatin-jangir Apr 3, 2023
ec1d6d4
add gitsensor in templates
jatin-jangir Apr 4, 2023
a4777b4
update gitsensor initcoontainer
jatin-jangir Apr 4, 2023
634a7da
updated for cicd module
jatin-jangir Apr 4, 2023
f865f1f
updated for installer for testing
jatin-jangir Apr 4, 2023
8ca9627
added migration for lens and gitsensor
jatin-jangir Apr 4, 2023
4e654f9
added random words to job
jatin-jangir Apr 4, 2023
9ce5fd7
deletion in inception
jatin-jangir Apr 4, 2023
0f6bb52
changed CM
jatin-jangir Apr 5, 2023
34cfbfc
Merge branch 'devtron-labs:main' into remove-kubewatch
jatin-jangir Apr 5, 2023
d95bc18
added nats
jatin-jangir Apr 5, 2023
c4958e7
added rollout
jatin-jangir Apr 5, 2023
acf4d6c
change crd
jatin-jangir Apr 5, 2023
91b3c75
change argocd-resources-json
jatin-jangir Apr 5, 2023
31c3a00
change argocd-resources-json fix
jatin-jangir Apr 5, 2023
8d204c6
added serviceAccount and CR and CRB
jatin-jangir Apr 6, 2023
5aa1af4
Merge branch 'devtron-labs:main' into remove-kubewatch
jatin-jangir Apr 6, 2023
23a1bf4
added secrets
jatin-jangir Apr 7, 2023
adef49d
Merge branch 'devtron-labs:main' into remove-kubewatch
jatin-jangir Apr 7, 2023
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
Prev Previous commit
Next Next commit
updated for cicd module
  • Loading branch information
@jatin-jangir
jatin-jangir committed Apr 4, 2023
commit 634a7da3bb929ce96c3ef420f53cf6b7bf2740e9
4 changes: 4 additions & 0 deletions charts/devtron/templates/gitsensor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{- if $.Values.installer.modules }}
{{- if has "cicd" $.Values.installer.modules }}
{{- with $.Values.gitsensor }}
# Source: gitsensor/templates/generic.yaml
apiVersion: v1
Expand Down Expand Up @@ -134,4 +136,6 @@ spec:
selector:
matchLabels:
app: git-sensor
{{- end}}
{{- end}}
{{- end}}
4 changes: 4 additions & 0 deletions charts/devtron/templates/kubewatch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{- if $.Values.installer.modules }}
{{- if has "cicd" $.Values.installer.modules }}
{{- if $.Values.components }}
{{- with .Values.components.kubewatch }}
# Source: kubewatch/templates/generic.yaml
Expand Down Expand Up @@ -199,4 +201,6 @@ spec:
configMap:
name: kubewatch-config
{{- end }}
{{- end }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/devtron/templates/lens.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{- if $.Values.installer.modules }}
{{- if has "cicd" $.Values.installer.modules }}
{{- with $.Values.lens }}
# Source: lens/templates/configmap.yaml
apiVersion: v1
Expand Down Expand Up @@ -108,4 +110,6 @@ spec:
resources:
{{ toYaml $.Values.lens.resources | indent 12 }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/devtron/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ global:
runAsUser: 1000
runAsNonRoot: true
installer:
repo: "devtron-labs/devtron"
repo: "jatin-jangir/devtron"
Copy link
Contributor

Choose a reason for hiding this comment

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

change it back to devtron-labs

# For Kubernetes version < 1.16, set release: legacy. You won't be able to upgrade Devtron unless you upgrade the K8s version to 1.16 or above.
release: "v0.6.14" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
release: "remove-kubewatch" #You can use a branch name or a release tag name as a release, for gitee as source only "main" is supported as of now
Copy link
Contributor

Choose a reason for hiding this comment

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

Same goes here - change it back

image: quay.io/devtron/inception
tag: 44b30917-185-13275
source: "github" # Available options are github and gitee
Expand All @@ -24,7 +24,7 @@ installer:
#Use secrets in plaintext, they'll be encoded to base64 automatically.
secrets:
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this change is required?

# If No POSTGRESQL_PASSWORD is provided, a password is automatically generated and saved in secret devtron-secret
POSTGRESQL_PASSWORD: "change-me"
# POSTGRESQL_PASSWORD: "change-me"

# REQUIRED IF BLOB_STORAGE_PROVIDER=AZURE Token with read write access to AZURE_BLOB_CONTAINER_CI_LOG and AZURE_BLOB_CONTAINER_CI_CACHE
# AZURE_ACCOUNT_KEY: "xxxxxxxxxx"
Expand Down
2 changes: 1 addition & 1 deletion manifests/install/devtron-installer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: installer-devtron
namespace: devtroncd
spec:
url: https://raw.githubusercontent.com/devtron-labs/devtron/v0.6.14/manifests/installation-script
url: https://raw.githubusercontent.com/jatin-jangir/devtron/remove-kubewatch/manifests/installation-script
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert these changes too