Skip to content

Commit

Permalink
Crossplane Provider should stay as Argo App, not sure about the config
Browse files Browse the repository at this point in the history
  • Loading branch information
jonashackt committed Jan 22, 2024
1 parent a661f12 commit 603cce3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 37 deletions.
24 changes: 18 additions & 6 deletions argocd/applications/crossplane-provider-aws-s3.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
apiVersion: pkg.crossplane.io/v1
kind: Provider
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: provider-aws-s3
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
annotations:
argocd.argoproj.io/sync-wave: "2"
spec:
package: xpkg.upbound.io/upbound/provider-aws-s3:v0.46.0
packagePullPolicy: Always
revisionActivationPolicy: Automatic
revisionHistoryLimit: 1
project: default
source:
repoURL: https://github.com/jonashackt/crossplane-argocd
targetRevision: HEAD
path: upbound/provider-aws-s3/provider
destination:
namespace: default
server: https://kubernetes.default.svc
# Using syncPolicy.automated here, otherwise the deployement of our Crossplane provider will fail with
# 'Resource not found in cluster: pkg.crossplane.io/v1/Provider:provider-aws-s3'
syncPolicy:
automated:
prune: true
23 changes: 0 additions & 23 deletions argocd/temp/crossplane-provider-aws.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions upbound/provider-aws-s3/config/provider-config-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apiVersion: aws.upbound.io/v1beta1
kind: ProviderConfig
metadata:
name: default
# The ProviderConfig needs to be deployed after the Provider (which has sync-wave: "0")
# So we use Argo's SyncWaves here https://argo-cd.readthedocs.io/en/stable/user-guide/sync-waves/
annotations:
argocd.argoproj.io/sync-wave: "1"
spec:
credentials:
source: Secret
Expand Down
4 changes: 0 additions & 4 deletions upbound/provider-aws-s3/provider/provider-aws-s3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apiVersion: pkg.crossplane.io/v1
kind: Provider
metadata:
name: provider-aws-s3
# The Provider needs to be deployed before the ProviderConfig (which has sync-wave: "1")
# So we use Argo's SyncWaves here https://argo-cd.readthedocs.io/en/stable/user-guide/sync-waves/
annotations:
argocd.argoproj.io/sync-wave: "-1"
spec:
package: xpkg.upbound.io/upbound/provider-aws-s3:v0.46.0
packagePullPolicy: Always
Expand Down

0 comments on commit 603cce3

Please sign in to comment.