code-refactoring: add secrets controller #1017

jaideepr97 · 2023-10-10T20:03:14Z

What type of PR is this?

Uncomment only one /kind line, and delete the rest.
For example, > /kind bug would simply become: /kind bug

/kind bug
/kind chore
/kind cleanup
/kind failing-test
/kind enhancement
/kind documentation
/kind code-refactoring

What does this PR do / why we need it:
Adds the new secret controller package that manages secrets not belonging to any specific component, these include:

argocd-secret
CA secret
TLS secret
in cluster permissions secret
default admin credentials secret

it also moves existing code to a file called removeFunctions.go so that replaced functions are tracked, and can be maintained in a way so as not to break project compilation unnecessarily, and can all be removed together at the end

Have you updated the necessary documentation?

Documentation update is required by this PR.
Documentation has been updated.

Which issue(s) this PR fixes:

Fixes #?

How to test changes / Special notes to the reviewer:

…j-labs#918) * upgrade golangci-lint Signed-off-by: Jaideep Rao <[email protected]> * fix phase reconciliation during host reconciliation Signed-off-by: Jaideep Rao <[email protected]> * address review comment Signed-off-by: Jaideep Rao <[email protected]> * set phase to pending if ingress not found Signed-off-by: Jaideep Rao <[email protected]> --------- Signed-off-by: Jaideep Rao <[email protected]>

* Move to only adding two roles for managed namespaces --------- Signed-off-by: Salem Elrahal <[email protected]> Co-authored-by: Salem Elrahal <[email protected]>

Track and expose custom operator performance metrics --------- Signed-off-by: Jaideep Rao <[email protected]>

…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 <[email protected]> Add funcs for ArgoCD alpha to beta conversion Signed-off-by: Siddhesh Ghadi <[email protected]> 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 <[email protected]> Resolve local build issues Signed-off-by: Siddhesh Ghadi <[email protected]> Tweak webhook configs Signed-off-by: Siddhesh Ghadi <[email protected]> Update operator installation docs Signed-off-by: Siddhesh Ghadi <[email protected]> Add e2e tests Signed-off-by: Siddhesh Ghadi <[email protected]> Minor updates Signed-off-by: Siddhesh Ghadi <[email protected]> Fix go-lint ci failure Signed-off-by: Siddhesh Ghadi <[email protected]> Update docs Signed-off-by: Siddhesh Ghadi <[email protected]> Remove webhook from 0.7.0 bundle Signed-off-by: Siddhesh Ghadi <[email protected]> Add spaces in bundle Signed-off-by: Siddhesh Ghadi <[email protected]> * update 0.8.0 bundle Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]>

…bs#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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* upgrade RH-SSO from 7.5 to 7.6 Signed-off-by: iam-veeramalla <[email protected]> * fix: failing tests Signed-off-by: iam-veeramalla <[email protected]> * fix: failing tests Signed-off-by: iam-veeramalla <[email protected]> --------- Signed-off-by: iam-veeramalla <[email protected]>

* Remove dead code Signed-off-by: Siddhesh Ghadi <[email protected]> * Fix import Signed-off-by: Siddhesh Ghadi <[email protected]> * Fix imports Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]>

Signed-off-by: Siddhesh Ghadi <[email protected]>

…bs#973) * Remove .spec.resourceCustomizations code Signed-off-by: Siddhesh Ghadi <[email protected]> * Update docs Signed-off-by: Siddhesh Ghadi <[email protected]> * Update docs Signed-off-by: Siddhesh Ghadi <[email protected]> * Address review comments Signed-off-by: Siddhesh Ghadi <[email protected]> * Fix typo Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]>

* upgrade ArgoCD version to 2.8.2 and update the CRDs Signed-off-by: ishitasequeira <[email protected]> * Update argocd image Signed-off-by: ishitasequeira <[email protected]> --------- Signed-off-by: ishitasequeira <[email protected]>

* Update ArgoCD v1alpha1 deprecation message Signed-off-by: Siddhesh Ghadi <[email protected]> * Run code gen Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: Siddhesh Ghadi <[email protected]>

…rgoproj-labs#985) * add support for tls self signed certs in AppSet Gitlab SCM Provider Signed-off-by: ishitasequeira <[email protected]> * add e2e test Signed-off-by: ishitasequeira <[email protected]> * add unit tests Signed-off-by: ishitasequeira <[email protected]> * renamed field ScmRootCaPath to SCMRootCaPath Signed-off-by: ishitasequeira <[email protected]> * Add documentation and address comments Signed-off-by: ishitasequeira <[email protected]> * Address comments Signed-off-by: ishitasequeira <[email protected]> --------- Signed-off-by: ishitasequeira <[email protected]>

…rgoproj-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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: iam-veeramalla <[email protected]>

) Signed-off-by: minchao <[email protected]>

…operator docs (argoproj-labs#1002) * Update requirements.txt added markdown= 3.3.7 and markdown-include=0.6.0 Signed-off-by: Surajyadav <[email protected]> * Delete docs/assets/extra.css deleted extra.css Signed-off-by: Surajyadav <[email protected]> * Update mkdocs.yml added markdown_extension markdown_include with codehighlight and toggle for screen mode Signed-off-by: Surajyadav <[email protected]> * Update mkdocs.yml Signed-off-by: Surajyadav <[email protected]> --------- Signed-off-by: Surajyadav <[email protected]>

…goproj-labs#1007) * fix: keycloak probes failure results in pod crash Signed-off-by: iam-veeramalla <[email protected]> * fix: use latest keycloak image to handle performance issue Signed-off-by: iam-veeramalla <[email protected]> --------- Signed-off-by: iam-veeramalla <[email protected]>

Signed-off-by: Jaideep Rao <[email protected]>

…perator into operator-redesign

…perator into op-redesign-add-secrets-controller

Signed-off-by: Jaideep Rao <[email protected]>

…perator into op-redesign-add-secrets-controller

Signed-off-by: Jaideep Rao <[email protected]>

ciiay · 2023-10-16T19:50:39Z

controllers/argocd/argocdcommon/helper.go

+		*changed = true
+	}
+
+	return existingVal, desiredVal


Why desiredVal is needed in the returnn?

ciiay · 2023-10-16T19:58:41Z

controllers/argocd/secret/secret.go

+	credSecretName := util.NameWithSuffix(sr.Instance.Name, DefaultClusterCredentialsSuffix)
+	credsSecret, err := workloads.GetSecret(credSecretName, sr.Instance.Namespace, sr.Client)
+	if err != nil {
+		sr.Logger.Error(err, "reconcileArgoCDSecret: failed to retrieve secret", "name", credSecretName, "namespace", sr.Instance.Namespace)


Do we need to add the "one or more mutations could not be applied" log here as well?

ciiay · 2023-10-16T19:59:27Z

controllers/argocd/secret/secret.go

+		argocdSecretReq := sr.getSecretRequest(*argocdSecretTmpl)
+		argocdSecret, err := workloads.RequestSecret(argocdSecretReq)
+		if err != nil {
+			sr.Logger.Error(err, "reconcileArgoCDSecret: failed to request secret", "name", ArgoCDSecretName, "namespace", sr.Instance.Namespace)


Or add the log here when request secret failed?

ciiay · 2023-10-16T20:00:54Z

controllers/argocd/secret/secret.go


-	// controller logic goes here
+	// nothing to do


Do we need this comment? If it's necessary can you add a condition like in which case nothing to do? Just to make it clearer.

ciiay · 2023-10-16T20:01:30Z

controllers/argocd/secret/secret.go

+		return nil
+	}
+
+	// secret exists, nothing to do


This is a good comment 👍

ciiay

Left a few comments. I'm not very clear about when to log "one or more mutations could not be applied".

jaideepr97 and others added 30 commits July 20, 2023 17:55

update owners file (argoproj-labs#953)

4d09aca

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

45f3597

* Move to only adding two roles for managed namespaces --------- Signed-off-by: Salem Elrahal <[email protected]> Co-authored-by: Salem Elrahal <[email protected]>

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

c7cfa8c

Track and expose custom operator performance metrics --------- Signed-off-by: Jaideep Rao <[email protected]>

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

89825db

setup 0.8.0 (argoproj-labs#966)

11299b7

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

e928c0e

Signed-off-by: Siddhesh Ghadi <[email protected]>

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

91bf131

Signed-off-by: iam-veeramalla <[email protected]>

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

cd7a54b

) Signed-off-by: minchao <[email protected]>

resolve all merge conflicts

43417be

Signed-off-by: Jaideep Rao <[email protected]>

fix broken references and update v1beta1 references

7c12e38

Signed-off-by: Jaideep Rao <[email protected]>

update missed references to argoproj

cf82e5d

Signed-off-by: Jaideep Rao <[email protected]>

revert v1beta1 alias to argoproj

520cdca

Signed-off-by: Jaideep Rao <[email protected]>

update more v1beta1 references to argoproj

7d22415

Signed-off-by: Jaideep Rao <[email protected]>

add argoprojv1alpha1 alias to v1alpha1 for naming consistency

7d8f070

Signed-off-by: Jaideep Rao <[email protected]>

address review comments

97c92d8

Signed-off-by: Jaideep Rao <[email protected]>

Merge branch 'operator-redesign' of github.com:argoproj-labs/argocd-o…

6768922

…perator into operator-redesign

Merge branch 'operator-redesign' of github.com:argoproj-labs/argocd-o…

a65b5ec

…perator into op-redesign-add-secrets-controller

add secrets controller

6a9f6e8

Signed-off-by: Jaideep Rao <[email protected]>

jaideepr97 added 4 commits October 10, 2023 16:01

Merge branch 'operator-redesign' of github.com:argoproj-labs/argocd-o…

00b7fe3

…perator into op-redesign-add-secrets-controller

restore argo-cd crd

069d50c

Signed-off-by: Jaideep Rao <[email protected]>

fix argo-cd crd

3c86bce

Signed-off-by: Jaideep Rao <[email protected]>

update tests

d730cdd

Signed-off-by: Jaideep Rao <[email protected]>

ciiay reviewed Oct 16, 2023

View reviewed changes

controllers/argocd/secret/secret.go

return nil

}

// secret exists, nothing to do

Copy link

Collaborator

ciiay Oct 16, 2023

Choose a reason for hiding this comment

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

This is a good comment 👍

ciiay reviewed Oct 16, 2023

View reviewed changes

jaideepr97 closed this Feb 14, 2024

jaideepr97 deleted the op-redesign-add-secrets-controller branch February 14, 2024 19:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

code-refactoring: add secrets controller #1017

code-refactoring: add secrets controller #1017

jaideepr97 commented Oct 10, 2023 •

edited

Loading

ciiay Oct 16, 2023

ciiay Oct 16, 2023

ciiay Oct 16, 2023

ciiay Oct 16, 2023

ciiay Oct 16, 2023

ciiay left a comment

code-refactoring: add secrets controller #1017

code-refactoring: add secrets controller #1017

Conversation

jaideepr97 commented Oct 10, 2023 • edited Loading

ciiay Oct 16, 2023

Choose a reason for hiding this comment

ciiay Oct 16, 2023

Choose a reason for hiding this comment

ciiay Oct 16, 2023

Choose a reason for hiding this comment

ciiay Oct 16, 2023

Choose a reason for hiding this comment

ciiay Oct 16, 2023

Choose a reason for hiding this comment

ciiay left a comment

Choose a reason for hiding this comment

jaideepr97 commented Oct 10, 2023 •

edited

Loading