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.

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

New version 0.0.2 #4

Merged
merged 1 commit into from
Nov 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
work.md
decription.md
/Makefile
build/
build/
.DS_Store
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![Argo CD](https://img.shields.io/badge/argocd-1.2.4-green.svg)
![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)
![Documentation Status](https://readthedocs.org/projects/argocd-operator-helm/badge/?version=latest)
![Latest Release](https://img.shields.io/badge/latest%20release-0.0.1-yellow.svg)
![Latest Release](https://img.shields.io/badge/latest%20release-0.0.2-yellow.svg)


# Argo CD Operator (Helm)
Expand Down
88 changes: 60 additions & 28 deletions deploy/crds/argoproj.io_v1alpha1_argocd_cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,25 @@ spec:
## Ref: https://github.com/argoproj/argo-cd
##
nameOverride: argocd
fullnameOverride: ""

# Optional CRD installation for those without Helm hooks
installCRDs: true

global:
image:
repository: argoproj/argocd
tag: v1.2.4
tag: v1.3.0
imagePullPolicy: IfNotPresent

## Controller
controller:
name: application-controller

image: {}
# repository: argoproj/argocd
# tag: v1.2.1
# imagePullPolicy: IfNotPresent
image:
repository: # argoproj/argocd
tag: # v1.3.0
imagePullPolicy: # IfNotPresent

## Argo controller commandline flags
args:
Expand All @@ -34,6 +38,7 @@ spec:
logLevel: info

## Additional command line arguments to pass to argocd-controller
## - key: value
extraArgs: []

## Annotations to be added to controller pods
Expand Down Expand Up @@ -79,7 +84,7 @@ spec:
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
##
nodeSelector: {}
tolerations: {}
tolerations: []
affinity: {}

priorityClassName: ""
Expand Down Expand Up @@ -124,7 +129,10 @@ spec:
repository: quay.io/dexidp/dex
tag: v2.14.0
imagePullPolicy: IfNotPresent
initImage: {}
initImage:
repository:
tag:
imagePullPolicy:

serviceAccount:
create: true
Expand All @@ -150,7 +158,7 @@ spec:
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
##
nodeSelector: {}
tolerations: {}
tolerations: []
affinity: {}

priorityClassName: ""
Expand Down Expand Up @@ -180,7 +188,7 @@ spec:
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
##
nodeSelector: {}
tolerations: {}
tolerations: []
affinity: {}

priorityClassName: ""
Expand All @@ -193,18 +201,22 @@ spec:
# cpu: 100m
# memory: 64Mi

volumeMounts: []
volumes: []

## Server
server:
name: server

image: {}
# repository: argoproj/argocd
# tag: v1.2.1
# imagePullPolicy: IfNotPresent
image:
repository: # argoproj/argocd
tag: # v1.3.0
imagePullPolicy: # IfNotPresent

## Additional command line arguments to pass to argocd-server
## - key: value
# extraArgs: []
# - insecure
# - insecure: true
extraArgs: []

## Argo server log level
Expand Down Expand Up @@ -247,7 +259,7 @@ spec:
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
##
nodeSelector: {}
tolerations: {}
tolerations: []
affinity: {}

priorityClassName: ""
Expand Down Expand Up @@ -302,11 +314,13 @@ spec:
## Hostnames must be provided if Ingress is enabled.
## Secrets must be manually created in the namespace
##
hosts: []
hosts:
[]
# - argocd.example.com
paths:
- /
tls: []
- /
tls:
[]
# - secretName: argocd-example-tls
# hosts:
# - argocd.example.com
Expand All @@ -316,7 +330,7 @@ spec:
# Find your domain with: kubectl describe --namespace=openshift-ingress-operator ingresscontroller/default | grep Domain:
# If 'hostname' is an empty string "" OpenShift will create a hostname for you.
route:
enabled: true
enabled: false
hostname: ""

## ArgoCD config
Expand All @@ -326,10 +340,28 @@ spec:
url: https://argocd.example.com
# Argo CD instance label key
application.instanceLabelKey: argocd.argoproj.io/instance
# repositories: |
# - url: git@github.com:group/repo.git
# sshPrivateKeySecret:
# name: secret-name
# key: sshPrivateKey
# oidc.config: |
# name: AzureAD
# issuer: https://login.microsoftonline.com/TENANT_ID/v2.0
# clientID: CLIENT_ID
# clientSecret: $oidc.azuread.clientSecret
# requestedIDTokenClaims:
# groups:
# essential: true
# requestedScopes:
# - openid
# - profile
# - email

## ArgoCD rbac config
## reference https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md
rbacConfig: {}
rbacConfig:
{}
# policy.csv is an file containing user-defined RBAC policies and role definitions (optional).
# Policy rules are in the form:
# p, subject, resource, action, object, effect
Expand All @@ -345,7 +377,6 @@ spec:
# authorizing API requests (optional). If omitted or empty, users may be still be able to login,
# but will see no apps, projects, etc...
# policy.default: role:readonly

# scopes controls which OIDC scopes to examine during rbac enforcement (in addition to `sub` scope).
# If omitted, defaults to: '[groups]'. The scope value can be a string, or a list of strings.
# scopes: '[cognito:groups, email]'
Expand Down Expand Up @@ -403,13 +434,13 @@ spec:
repoServer:
name: repo-server

image: {}
# repository: argoproj/argocd
# tag: v1.2.1
# imagePullPolicy: IfNotPresent
image:
repository: # argoproj/argocd
tag: # v1.3.0
imagePullPolicy: # IfNotPresent

## Additional command line arguments to pass to argocd-repo-server
##
## - key: value
extraArgs: []

## Argo repoServer log level
Expand Down Expand Up @@ -452,7 +483,7 @@ spec:
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
##
nodeSelector: {}
tolerations: {}
tolerations: []
affinity: {}

priorityClassName: ""
Expand Down Expand Up @@ -497,7 +528,8 @@ spec:
gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
ssh.dev.azure.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
tlsCerts: {}
tlsCerts:
{}
# data:
# argocd.example.com: |
# -----BEGIN CERTIFICATE-----
Expand Down
8 changes: 0 additions & 8 deletions deploy/dev/operator-group.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions deploy/dev/operator-source.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions deploy/dev/operator-subscription.yaml

This file was deleted.

30 changes: 0 additions & 30 deletions deploy/dev/operator.yaml

This file was deleted.

81 changes: 0 additions & 81 deletions deploy/dev/role.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions deploy/dev/role_binding.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions deploy/dev/service_account.yaml

This file was deleted.

Loading