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

code-refactoring: Gitops 3127 implement applicationset controller package #1011

Merged
merged 16 commits into from
Oct 5, 2023
Merged

code-refactoring: Gitops 3127 implement applicationset controller package #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f4f5f81
WIP adding app set controller
ciiay Sep 19, 2023
5600f72
Merge remote-tracking branch 'upstream/operator-redesign' into gitops…
ciiay Sep 20, 2023
1007669
Added kuttl tests
ciiay Sep 20, 2023
fe7d60f
Updated unit tests
ciiay Sep 21, 2023
67d0fcc
Merge remote-tracking branch 'upstream/operator-redesign' into gitops…
ciiay Sep 29, 2023
c04d657
Finished unit tests
ciiay Sep 29, 2023
ddfabdf
Addressed issues in pr review feedback
ciiay Oct 2, 2023
1a2d28f
Fixed complier problems & updated util function location
ciiay Oct 3, 2023
333b43a
Code improvement
ciiay Oct 3, 2023
51dbdf3
Minor func name refactor
ciiay Oct 3, 2023
82c2be9
Added else condition for delete appset resources
ciiay Oct 3, 2023
5aeeb87
Added webhook route resource
ciiay Oct 4, 2023
3c978d1
Merge upstream
ciiay Oct 4, 2023
8e81a1e
Moved WebhookServer.Route.Enabled check to ApplicationSetReconciler.R…
ciiay Oct 5, 2023
9e6bbc9
Merge remote-tracking branch 'upstream/operator-redesign' into gitops…
ciiay Oct 5, 2023
6dcd84d
Minor fix for webhook route
ciiay Oct 5, 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
2 changes: 1 addition & 1 deletion common/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const (
ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"

// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
ArgoCDDefaultArgoVersion = "sha256:7daba5f38b23f4f091951b727db6f87dc04ad396fd21044401502438d633836e" // v2.7.6
ArgoCDDefaultArgoVersion = "sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786" // v2.8.3

// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
ArgoCDDefaultBackupKeyLength = 32
Expand Down
20 changes: 18 additions & 2 deletions common/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ const (
// ArgoCDRepoServerTLS is the argocd repo server tls value.
ArgoCDRepoServerTLS = "argocd-repo-server-tls"

// K8sOSLinux is the value for kubernetes.io/os key for linux pods
K8sOSLinux = "linux"
// ArgoCDAppSetGitlabSCMTLSCertsConfigMapName is the hard-coded ApplicationSet Gitlab SCM TLS certificate data ConfigMap name.
ArgoCDAppSetGitlabSCMTLSCertsConfigMapName = "argocd-appset-gitlab-scm-tls-certs-cm"

// K8sOSLinux is the value for kubernetes.io/os key for linux pods
K8sOSLinux = "linux"

// ArgoCDRedisServerTLSSecretName is the name of the TLS secret for the redis-server
ArgoCDRedisServerTLSSecretName = "argocd-operator-redis-tls"

Expand All @@ -62,6 +63,15 @@ const (
VolumeMountPathTLS = "/app/config/tls"
VolumeMountPathRepoServerTLS = "/app/config/reposerver/tls"
WorkingDirApp = "/app"
Webhook = "webhook"
SSHKnownHosts = "ssh-known-hosts"
VolumeMountPathSSH = "/app/config/ssh"
GPGKeys = "gpg-keys"
VolumeMountPathGPG = "/app/config/gpg/source"
GPGKeyRing = "gpg-keyring"
VolumeMountPathGPGKeyring = "/app/config/gpg/keys"
VolumeTmp = "tmp"
VolumeMountPathTmp = "/tmp"
)

// API group versions and resource kinds
Expand All @@ -75,5 +85,11 @@ const (
RoleBindingKind = "RoleBinding"
ConfigMapKind = "ConfigMap"
SecretKind = "Secret"
ServiceKind = "Service"
ServiceAccountKind = "ServiceAccount"
)

// Commnds
const (
LogLevel = "--loglevel"
)
Loading
Loading