Skip to content

Commit

Permalink
code-refactoring: implement repo-server (argoproj-labs#1212)
Browse files Browse the repository at this point in the history
* fix: don't set phase to available during host reconciliation  (argoproj-labs#918)

* upgrade golangci-lint

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* fix phase reconciliation during host reconciliation

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* address review comment

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* set phase to pending if ingress not found

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

---------

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* update owners file (argoproj-labs#953)

* Move to only adding two roles for managed namespaces (argoproj-labs#954)

* Move to only adding two roles for managed namespaces
---------

Signed-off-by: Salem Elrahal <selrahal@redhat.com>
Co-authored-by: Salem Elrahal <selrahal@redhat.com>

* feat: expose operator metrics  (argoproj-labs#928)

Track and expose custom operator performance metrics
---------

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add build.os config for readthedocs (argoproj-labs#967)

* setup 0.8.0 (argoproj-labs#966)

* feat: Add conversion webhook for ArgoCD v1alpha1 to v1beta1 migration (argoproj-labs#964)

* Add ArgoCD v1beta1 & deprecate v1alpha1

- Add new ArgoCD v1beta1 api
- Mark ArgoCD v1alpha1 as deprecated & add back the removed sso fields
- Use server side validation for "kubectl apply" as client side results into
  failure due to exceeding annotation size limit.

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Add funcs for ArgoCD alpha to beta conversion

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Add conversion webhook

- Create webhook & setup webhook server on 9443
- Disable operator namespaced install via OLM so that OLM can handle certs for webhook server
- For manual install, user needs to explicitly configure cert manager to inject certs and enable
  webhook server in operator by setting env ENABLE_CONVERSION_WEBHOOK="true"

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Resolve local build issues

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Tweak webhook configs

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Update operator installation docs

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Add e2e tests

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Minor updates

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Fix go-lint ci failure

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Update docs

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Remove webhook from 0.7.0 bundle

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

Add spaces in bundle

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* update 0.8.0 bundle

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* chore(deps): bump pygments from 2.7.4 to 2.15.0 in /docs (argoproj-labs#950)

Bumps [pygments](https://github.com/pygments/pygments) from 2.7.4 to 2.15.0.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.7.4...2.15.0)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: upgrade RH-SSO from 7.5 to 7.6 (argoproj-labs#977)

* upgrade RH-SSO from 7.5 to 7.6

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix: failing tests

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix: failing tests

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

---------

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* refactor: Remove dead code (argoproj-labs#979)

* Remove dead code

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix import

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix imports

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Replace ArgoCD v1alpha1 references with v1beta1 (argoproj-labs#975)

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* refactor: Remove deprecated .spec.resourceCustomizations (argoproj-labs#973)

* Remove .spec.resourceCustomizations code

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Update docs

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Update docs

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Address review comments

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix typo

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* upgrade ArgoCD version to 2.8.2 and update the CRDs (argoproj-labs#984)

* upgrade ArgoCD version to 2.8.2 and update the CRDs

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Update argocd image

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* chore: Update ArgoCD v1alpha1 deprecation message (argoproj-labs#988)

* Update ArgoCD v1alpha1 deprecation message

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Run code gen

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Add support for tls self signed certs in AppSet Gitlab SCM Provider (argoproj-labs#985)

* add support for tls self signed certs in AppSet Gitlab SCM Provider

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* add e2e test

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* add unit tests

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* renamed field ScmRootCaPath to SCMRootCaPath

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Add documentation and address comments

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Address comments

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* chore(deps): bump github.com/argoproj/argo-cd/v2 from 2.8.2 to 2.8.3 (argoproj-labs#992)

Bumps [github.com/argoproj/argo-cd/v2](https://github.com/argoproj/argo-cd) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/argoproj/argo-cd/releases)
- [Changelog](https://github.com/argoproj/argo-cd/blob/master/CHANGELOG.md)
- [Commits](argoproj/argo-cd@v2.8.2...v2.8.3)

---
updated-dependencies:
- dependency-name: github.com/argoproj/argo-cd/v2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: pick up argo cd v2.8.3 (argoproj-labs#993)

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix: replace deprecated syntax in kustomization.yaml (argoproj-labs#1000)

Signed-off-by: minchao <minchao.220@gmail.com>

* Missing syntax-highlighting, toggle button for screen mode in argocd-operator docs (argoproj-labs#1002)

* Update requirements.txt

added markdown= 3.3.7 and  markdown-include=0.6.0

Signed-off-by: Surajyadav <harrypotter1108@gmail.com>

* Delete docs/assets/extra.css

deleted extra.css

Signed-off-by: Surajyadav <harrypotter1108@gmail.com>

* Update mkdocs.yml

added markdown_extension  markdown_include with  codehighlight and toggle for screen mode

Signed-off-by: Surajyadav <harrypotter1108@gmail.com>

* Update mkdocs.yml

Signed-off-by: Surajyadav <harrypotter1108@gmail.com>

---------

Signed-off-by: Surajyadav <harrypotter1108@gmail.com>

* fix: keycloak probes failure and intermittent perforamance issues (argoproj-labs#1007)

* fix: keycloak probes failure results in pod crash

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix: use latest keycloak image to handle performance issue

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

---------

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* Implemented service, servicemonitor and tlssecret

Signed-off-by: Yi Cai <yicai@redhat.com>

* Resolved some compiler errors

Signed-off-by: Yi Cai <yicai@redhat.com>

* bug: fix heathcheck subkey generation for resources with no group  (argoproj-labs#1013)

* account for empty group during resource customization config subkey generation

---------

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* Compiler error fix

Signed-off-by: Yi Cai <yicai@redhat.com>

* Fixed compiler errors

Signed-off-by: Yi Cai <yicai@redhat.com>

* Added partial unit tests

Signed-off-by: Yi Cai <yicai@redhat.com>

* Added unit tests(except for tlssecret)

Signed-off-by: Yi Cai <yicai@redhat.com>

* chore(deps): bump golang.org/x/net from 0.11.0 to 0.17.0 (argoproj-labs#1019)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.11.0 to 0.17.0.
- [Commits](golang/net@v0.11.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Addressed comments

Signed-off-by: Yi Cai <yicai@redhat.com>

* Add labelSelector option to filter the ArgoCD instances for reconciliation (argoproj-labs#961)

* Added labelselector string to map conversion

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Changed data-type for labelSelector to parse string

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Added code to reconcile selected ArgoCD instances based on label selector

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* remove comments

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Updated argoCD label fetch, renamed env var

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Updated unit test and yaml

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Updated unit test

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Fix yaml env ValueFrom field

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Added comments and labelSelector check in main.go

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* removed label-selector option from manifest

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* updated label-selector format in manifests

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* added label selector logs

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* go mod tidy

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* added e2e tests for label-selector

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* restructured kuttl files and added operator patch file

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* go mod tidy

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* corrected kuttl tests for cm failure

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Added documentation for Environment Variable ARGOCD_LABEL_SELECTOR

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* cleanup

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* improved unit tests and some minor changes

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* kuttl rerun

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* removed env var

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* misc modifications

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* argocd-operator csv correction

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* fix bundle error

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* fix bundle error

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* fix manifests build

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Added more unit test cases

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* rebase

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* removed excess reconcilers

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* minor fix

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* removed extraneous test case and cleaned manager.yaml

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* cleaned manager.yaml

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* fix make bundle issue

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* fix make bundle issue

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

---------

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Co-authored-by: ishitasequeira <ishiseq29@gmail.com>

* Addressed discussed a few points

Signed-off-by: Yi Cai <yicai@redhat.com>

* fix: address CVE-2023-39325 (argoproj-labs#1022)

*address CVE-2023-39325
- upgrade to golang v1.20.10
- disable http/2 for webhook and metrics server, use http/1.1 by default but make it a configurable flag
- upgarde k8s library packages to v0.28.3
- Add new structs for keycloak API that were previously part of the (now deprecated) keycloak-operator repo
- upgrade to controller-runtime to v0.16.3
- refactor all unit tests

---------

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* Add gcp cherry-pick bot config (argoproj-labs#1023)

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Updated logic to decide if use TLS for redis

Signed-off-by: Yi Cai <yicai@redhat.com>

* Add .github/dependabot.yml to enable auto dependency version updates (argoproj-labs#1025)

* feat(dex): add optional env field (argoproj-labs#1005)

* feat(dex): add optional env field

Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>

* fix: remove non-default configuration

Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>

* fix: v1alpha1 is deprecated

Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>

* fix: convert dex spec between api versions

Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>

* fix: ensure there is no diff in the bundle

Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>

---------

Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>

* fix: replace deprecated AddToScheme with Install, and deprecated SchemeGroupVersion with GroupVersion. (argoproj-labs#1066)

Signed-off-by: Cheng Fang <cfang@redhat.com>

* allow enabling ArgoCD workloads independently (argoproj-labs#1021)

* allow enabling ArgoCD core workloads independently

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix lint

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* check for dependent component urls if dependent components are disabled

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix build

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix make bundle

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix tests

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Update flags for each component

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Update configuration using remote flag

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix CI

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Address comments

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Addressed feedback

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* update conversion webhook

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix make build

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* chore(deps): bump argoproj/argocd in /build/util (argoproj-labs#1080)

Bumps argoproj/argocd from `d40da8f` to `644c386`.

---
updated-dependencies:
- dependency-name: argoproj/argocd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: upgrade Argo CD for release v.9.0 (argoproj-labs#1082)

* feat: upgrade Argo CD for release v.9.0

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix: unit test failures

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

---------

Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>

* fix the logic for applicationset resources reconcilation when spec.applicationset.enabled is false (argoproj-labs#1089)

* fix the logic for applicationset resources reconciliation when spec.applicationset.enabled is false

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix tests

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* delete repo server when repo.enabled is set to false

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Update status.Phase based on component enabled flag

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Added kuttl tests

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Added namespace creation step

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* delete services created for resources

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* delete server deployment when enabled flag set to false

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix e2e test

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix log message

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* revert kuttl test timeout

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Added test for reverse scenario

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Dir rename

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

* Added e2e test for ha mode

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Co-authored-by: Raghavi Shirur <rshirur@redhat.com>

* docs: enabling/disabling individual argocd core components (argoproj-labs#1098)

* Add documentation for enabling/disabling argocd core components

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* rephrase doc

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* Address comments

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

---------

Signed-off-by: ishitasequeira <ishiseq29@gmail.com>

* fix: Proper reference to where to find default admin password (argoproj-labs#1094)

Signed-off-by: ikegentz <isaac.gentz@gmail.com>

* Removed extra constants.go

Signed-off-by: Yi Cai <yicai@redhat.com>

* adding applicationsets in server rbac policy rule (argoproj-labs#1140)

Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>

* Updated constants following coding standard

Signed-off-by: Yi Cai <yicai@redhat.com>

* remove extra argoutils

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add mutation args, instance ref, openshift mutations

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* change references

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* fix logic to allow processor operation to be less than default value (argoproj-labs#1146)

* fix logic to allow operation processors to be less than default value

---------

Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>

* port mutation changes from redis branch

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* port changes to common constants

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* Use correct repo-server address for notification controller (argoproj-labs#1125)

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* undo changes to common pkg

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* wip: fix up repo-server

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove notifs files

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* minimize changes outside of reposerver folder

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove changes to argocd controller

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove other changes

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove util file

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* wip polish repo-server

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* generalize tls annotation mutation for all components

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add comment

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* retouch sm, svc, sa, status, secret

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add prometheus const

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* finish repo-server implementation

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* finish implementation for repo-server

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* move repo deployment to toberemoved

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add global test pkg

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* split argocd tbr file

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* move repo server code to dedicated tbr file

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove log verbosities and trace markers in info msgs

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* start adding unit tests

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* move test reconciler client and scheme to global test pkg

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* rename argocd test reconciler

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* wip add unit tests for repo-server

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* update all references to updateifchanged

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* finish adding unit tests

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add helper unit tests

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add unit tests for resource deletion & trigger rollout

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add resource helper & updated trigger rollout

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* modify scheme opt signature

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add helpers

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove unnecessary changes

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* undo unneccesary appset changes

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add nil check for ss

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* wip: add unit tests with mocks

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add unit test for get args

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* wip add deployment unit test

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add metrics suffix, generalize name generation logic

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* fix method signature

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* remove need for dedicated metrics suffix

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* allow passing in existing resources to test fns for minor drift checks

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add status reconciliation fns for all components, reconcile statuses at end of cycle

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* generalize usetls logic

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

* add tls check at beginning of reconciliation

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

---------

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
Signed-off-by: Salem Elrahal <selrahal@redhat.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: iam-veeramalla <abhishek.veeramalla@gmail.com>
Signed-off-by: ishitasequeira <ishiseq29@gmail.com>
Signed-off-by: minchao <minchao.220@gmail.com>
Signed-off-by: Surajyadav <harrypotter1108@gmail.com>
Signed-off-by: Yi Cai <yicai@redhat.com>
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
Signed-off-by: Ishita Sequeira <ishiseq29@gmail.com>
Signed-off-by: Robert Deusser <robertjdeusser@gmail.com>
Signed-off-by: Cheng Fang <cfang@redhat.com>
Signed-off-by: ikegentz <isaac.gentz@gmail.com>
Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>
Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>
Co-authored-by: Regina Scott <50851526+reginapizza@users.noreply.github.com>
Co-authored-by: Salem Elrahal <salemelrahal@gmail.com>
Co-authored-by: Salem Elrahal <selrahal@redhat.com>
Co-authored-by: Siddhesh Ghadi <61187612+svghadi@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Abhishek Veeramalla <abhishek.veeramalla@gmail.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Co-authored-by: Minchao <minchao.220@gmail.com>
Co-authored-by: Suraj yadav <harrypotter1108@gmail.com>
Co-authored-by: Yi Cai <yicai@redhat.com>
Co-authored-by: Raghavi <rshirur@redhat.com>
Co-authored-by: ishitasequeira <ishiseq29@gmail.com>
Co-authored-by: Cheng Fang <cfang@redhat.com>
Co-authored-by: Robert Deusser <5935071+rdeusser@users.noreply.github.com>
Co-authored-by: Isaac Gentz <isaac.gentz@gmail.com>
Co-authored-by: Mangaal <44372157+Mangaal@users.noreply.github.com>
Co-authored-by: Anand Kumar Singh <anandrkskd@gmail.com>
  • Loading branch information
18 people authored and Julia Teslia committed Apr 24, 2024
1 parent eeb5b22 commit a12e1c8
Show file tree
Hide file tree
Showing 108 changed files with 7,019 additions and 3,765 deletions.
10 changes: 5 additions & 5 deletions coding-standards-and-best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,18 @@ if rr.Instance.Spec.HA.Enabled {
acr.Logger.Error(err, "reconcileManagedRoles: failed to retrieve role", "name", existingRole.Name, "namespace", existingRole.Namespace)
```

- Use debug level (`Logger.V(1).Info`) when recording non-essential information. i.e, information on events that don't block happy path execution, but can provide hints if troubleshooting is needed e.g:
- Use debug level (`Logger.Debug`) when recording non-essential information. i.e, information on events that don't block happy path execution, but can provide hints if troubleshooting is needed e.g:

```
acr.Logger.V(1).Info("reconcileManagedRoles: one or more mutations could not be applied")
acr.Logger.V(1).Info("reconcileManagedRoles: skip reconciliation in favor of custom role", "name", customRoleName)
acr.Logger.Debug("reconcileManagedRoles: one or more mutations could not be applied")
acr.Logger.Debug("reconcileManagedRoles: skip reconciliation in favor of custom role", "name", customRoleName)
```

- Use Info level (`Logger.Info` or `Logger.V(0).Info`) for all other info-level logs. Any new action taken by the controller that is critical to normal functioning.
- Use Info level (`Logger.Info`) for all other info-level logs. Any new action taken by the controller that is critical to normal functioning.
- - No need to mention function names when logging at `info` level. eg:

```
acr.Logger.V(0).Info("role created", "name", desiredRole.Name, "namespace", desiredRole.Namespace)
acr.Logger.Info("role created", "name", desiredRole.Name, "namespace", desiredRole.Namespace)
```

- Only use log statements to log success/error if the function belongs to a controller package and is invoked by the controller. No need to log statements from utility/helper packages. e.g:
Expand Down
9 changes: 9 additions & 0 deletions common/TOBEREMOVED.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,15 @@ const (
// ArgoCDRedisHAImageEnvVar is the environment variable used to get the image
// to used for the the Redis container in HA mode.
ArgoCDRedisHAImageEnvVar = "ARGOCD_REDIS_HA_IMAGE"

// ArgoCDDefaultRepoMetricsPort is the default listen port for the Argo CD repo server metrics.
ArgoCDDefaultRepoMetricsPort = 8084

// ArgoCDDefaultRepoServerPort is the default listen port for the Argo CD repo server.
ArgoCDDefaultRepoServerPort = 8081

// ArgoCDKeyRelease is the prometheus release key for labels.
ArgoCDKeyRelease = "release"
)

// DefaultLabels returns the default set of labels for controllers.
Expand Down
6 changes: 2 additions & 4 deletions common/envVars.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ const (
// to used for the Keycloak container.
ArgoCDKeycloakImageEnvVar = "ARGOCD_KEYCLOAK_IMAGE"

// ArgoCDRepoImageEnvVar is the environment variable used to get the image
// to used for the Dex container.
ArgoCDRepoImageEnvVar = "ARGOCD_REPOSERVER_IMAGE"

// ArgoCDGrafanaImageEnvVar is the environment variable used to get the image
// to used for the Grafana container.
ArgoCDGrafanaImageEnvVar = "ARGOCD_GRAFANA_IMAGE"
Expand All @@ -34,4 +30,6 @@ const (

// ArgoCDLabelSelectorEnvVar is an environment variable that contains the labels used for selective instance reconilliation.
ArgoCDLabelSelectorEnvVar = "ARGOCD_LABEL_SELECTOR"

ArgoCDExecTimeoutEnvVar = "ARGOCD_EXEC_TIMEOUT"
)
3 changes: 0 additions & 3 deletions common/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ const (
// ArgoCDKeyRBACScopes is the configuration key for the Argo CD RBAC scopes.
ArgoCDKeyRBACScopes = "scopes"

// ArgoCDKeyRelease is the prometheus release key for labels.
ArgoCDKeyRelease = "release"

// ArgoCDKeyResourceExclusions is the configuration key for resource exclusions.
ArgoCDKeyResourceExclusions = "resource.exclusions"

Expand Down
1 change: 1 addition & 0 deletions common/notifications.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package common

// notifications
const (
NotificationsController = "notifications-controller"
NotificationsControllerComponent = "argocd-notifications-controller"
NotificationsSecretName = "argocd-notifications-secret"
NotificationsConfigMapName = "argocd-notifications-cm"
Expand Down
3 changes: 3 additions & 0 deletions common/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ package common
const (
// ArgoCDKeyPrometheus is the resource prometheus key for labels.
ArgoCDKeyPrometheus = "prometheus"

// PrometheusReleaseKey is the prometheus release key for labels.
PrometheusReleaseKey = "release"
)

// defaults
Expand Down
8 changes: 8 additions & 0 deletions common/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,11 @@ const (
const (
RedisTLSCertChangedKey = "redis.tls.cert.changed"
)

// commands
const (
RedisCmd = "--redis"
RedisUseTLSCmd = "--redis-use-tls"
RedisInsecureSkipTLSVerifyCmd = "--redis-insecure-skip-tls-verify"
RedisCACertificate = "--redis-ca-certificate"
)
37 changes: 32 additions & 5 deletions common/reposerver.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@ package common

// names
const (
RepoServerController = "repo-server-controller"

// RepoServerComponent is the repo-server control plane component
RepoServerComponent = "repo-server"

ArgoCDRepoServerName = "argocd-repo-server"

// ArgoCDRepoServerTLSSecretName is the name of the TLS secret for the repo-server
ArgoCDRepoServerTLSSecretName = "argocd-repo-server-tls"
)

RepoServerSuffix = "-repo-server"
// suffixes
const (
RepoServerSuffix = "repo-server"
)

// values
Expand All @@ -16,9 +26,26 @@ const (

// defaults
const (
// ArgoCDDefaultRepoMetricsPort is the default listen port for the Argo CD repo server metrics.
ArgoCDDefaultRepoMetricsPort = 8084
// DefaultRepoServerMetricsPort is the default listen port for the Argo CD repo server metrics.
DefaultRepoServerMetricsPort = 8084

// DefaultRepoServerPort is the default listen port for the Argo CD repo server.
DefaultRepoServerPort = 8081
)

// env vars
const (
// ArgoCDRepoImageEnvVar is the environment variable used to get the image to be used for
// the repo-server container
ArgoCDRepoImageEnvVar = "ARGOCD_REPOSERVER_IMAGE"
)

// ArgoCDDefaultRepoServerPort is the default listen port for the Argo CD repo server.
ArgoCDDefaultRepoServerPort = 8081
// keys
const (
RepoTLSCertChangedKey = "repo.tls.cert.changed"
)

// commands
const (
RepoServerCmd = "argocd-repo-server"
)
6 changes: 5 additions & 1 deletion common/values.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ const (
ArgoCDStatusRunning = "Running"

ArgoCDStatusAvailable = "Available"

PrometheusOperator = "prometheus-operator"
)
>>>>>>> ae37d0a (retain old and new constants. .github folder changes, fix errors (#1133))

Expand Down Expand Up @@ -134,5 +136,7 @@ const (

// Commnds
const (
LogLevel = "--loglevel"
LogLevelCmd = "--loglevel"
LogFormatCmd = "--logformat"
UidEntryPointSh = "uid_entrypoint.sh"
)
Loading

0 comments on commit a12e1c8

Please sign in to comment.