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

feat: metaphor management #777

Merged
merged 8 commits into from
Jul 18, 2024
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
21 changes: 21 additions & 0 deletions akamai-github/registry/environments/development/docker-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: development-docker-config
spec:
refreshInterval: 10s
secretStoreRef:
name: vault-kv-secret
kind: ClusterSecretStore
target:
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .dockerconfig | toString }}"
name: docker-config
creationPolicy: Owner
data:
- secretKey: "dockerconfig"
remoteRef:
property: dockerconfig
key: dockerconfigjson
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
path: registry/environments/development/metaphor
targetRevision: HEAD
destination:
name: <WORKLOAD_CLUSTER_NAME>
name: in-cluster
namespace: development
syncPolicy:
automated:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ metaphor:
host: https://metaphor-development.<DOMAIN_NAME>/api
console: https://kubefirst.<DOMAIN_NAME>

clusterSecretStoreName: <WORKLOAD_CLUSTER_NAME>-vault-kv-secret
vaultSecretPath: <WORKLOAD_CLUSTER_NAME>/metaphor
clusterSecretStoreName: vault-kv-secret
vaultSecretPath: development/metaphor
configs:
configOne: <WORKLOAD_CLUSTER_NAME>-config-one
configTwo: <WORKLOAD_CLUSTER_NAME>-config-two
configOne: development-config-one
configTwo: development-config-two
21 changes: 21 additions & 0 deletions akamai-github/registry/environments/production/docker-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: production-docker-config
spec:
refreshInterval: 10s
secretStoreRef:
name: vault-kv-secret
kind: ClusterSecretStore
target:
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .dockerconfig | toString }}"
name: docker-config
creationPolicy: Owner
data:
- secretKey: "dockerconfig"
remoteRef:
property: dockerconfig
key: dockerconfigjson
4 changes: 2 additions & 2 deletions akamai-github/registry/environments/production/metaphor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ metadata:
finalizers:
- resources-finalizer.argocd.argoproj.io
annotations:
argocd.argoproj.io/sync-wave: '45'
argocd.argoproj.io/sync-wave: "45"
spec:
project: default
source:
repoURL: <GITOPS_REPO_URL>
path: registry/environments/production/metaphor
targetRevision: HEAD
destination:
name: <WORKLOAD_CLUSTER_NAME>
name: in-cluster
namespace: production
syncPolicy:
automated:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ metaphor:
host: https://metaphor-production.<DOMAIN_NAME>/api
console: https://kubefirst.<DOMAIN_NAME>

clusterSecretStoreName: <WORKLOAD_CLUSTER_NAME>-vault-kv-secret
vaultSecretPath: <WORKLOAD_CLUSTER_NAME>/metaphor
clusterSecretStoreName: vault-kv-secret
vaultSecretPath: production/metaphor
configs:
configOne: <WORKLOAD_CLUSTER_NAME>-config-one
configTwo: <WORKLOAD_CLUSTER_NAME>-config-two
configOne: production-config-one
configTwo: production-config-two
21 changes: 21 additions & 0 deletions akamai-github/registry/environments/staging/docker-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: staging-docker-config
spec:
refreshInterval: 10s
secretStoreRef:
name: vault-kv-secret
kind: ClusterSecretStore
target:
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .dockerconfig | toString }}"
name: docker-config
creationPolicy: Owner
data:
- secretKey: "dockerconfig"
remoteRef:
property: dockerconfig
key: dockerconfigjson
2 changes: 1 addition & 1 deletion akamai-github/registry/environments/staging/metaphor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
path: registry/environments/staging/metaphor
targetRevision: HEAD
destination:
name: <WORKLOAD_CLUSTER_NAME>
name: in-cluster
namespace: staging
syncPolicy:
automated:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ metaphor:
host: https://metaphor-staging.<DOMAIN_NAME>/api
console: https://kubefirst.<DOMAIN_NAME>

clusterSecretStoreName: <WORKLOAD_CLUSTER_NAME>-vault-kv-secret
vaultSecretPath: <WORKLOAD_CLUSTER_NAME>/metaphor
clusterSecretStoreName: vault-kv-secret
vaultSecretPath: staging/metaphor
configs:
configOne: <WORKLOAD_CLUSTER_NAME>-config-one
configTwo: <WORKLOAD_CLUSTER_NAME>-config-two
configOne: staging-config-one
configTwo: staging-config-two
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
project: default
source:
repoURL: https://charts.kubefirst.com
targetRevision: 2.4.12
targetRevision: 2.4.13
chart: kubefirst
helm:
values: |-
Expand Down
24 changes: 24 additions & 0 deletions akamai-github/templates/mgmt/development.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: development
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
annotations:
argocd.argoproj.io/sync-wave: '60'
spec:
project: default
source:
repoURL: <GITOPS_REPO_URL>
path: registry/environments/development
targetRevision: HEAD
destination:
name: in-cluster
namespace: development
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
24 changes: 24 additions & 0 deletions akamai-github/templates/mgmt/production.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: production
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
annotations:
argocd.argoproj.io/sync-wave: '60'
spec:
project: default
source:
repoURL: <GITOPS_REPO_URL>
path: registry/environments/production
targetRevision: HEAD
destination:
name: in-cluster
namespace: production
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
24 changes: 24 additions & 0 deletions akamai-github/templates/mgmt/staging.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: staging
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
annotations:
argocd.argoproj.io/sync-wave: '60'
spec:
project: default
source:
repoURL: <GITOPS_REPO_URL>
path: registry/environments/staging
targetRevision: HEAD
destination:
name: in-cluster
namespace: staging
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
21 changes: 21 additions & 0 deletions aws-github/registry/environments/development/docker-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: development-docker-config
spec:
refreshInterval: 10s
secretStoreRef:
name: vault-kv-secret
kind: ClusterSecretStore
target:
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .dockerconfig | toString }}"
name: docker-config
creationPolicy: Owner
data:
- secretKey: "dockerconfig"
remoteRef:
property: dockerconfig
key: dockerconfigjson
2 changes: 1 addition & 1 deletion aws-github/registry/environments/development/metaphor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
path: registry/environments/development/metaphor
targetRevision: HEAD
destination:
name: <WORKLOAD_CLUSTER_NAME>
name: in-cluster
namespace: development
syncPolicy:
automated:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ metaphor:
className: nginx
enabled: true
annotations:
cert-manager.io/cluster-issuer: 'letsencrypt-prod'
<CERT_MANAGER_ISSUER_ANNOTATION_1>
<CERT_MANAGER_ISSUER_ANNOTATION_2>
<CERT_MANAGER_ISSUER_ANNOTATION_3>
<CERT_MANAGER_ISSUER_ANNOTATION_4>
nginx.ingress.kubernetes.io/service-upstream: "true"
hosts:
- host: metaphor-development.<DOMAIN_NAME>
Expand All @@ -26,8 +29,8 @@ metaphor:
host: https://metaphor-development.<DOMAIN_NAME>/api
console: https://kubefirst.<DOMAIN_NAME>

clusterSecretStoreName: <WORKLOAD_CLUSTER_NAME>-vault-kv-secret
vaultSecretPath: <WORKLOAD_CLUSTER_NAME>/metaphor
clusterSecretStoreName: vault-kv-secret
vaultSecretPath: development/metaphor
configs:
configOne: <WORKLOAD_CLUSTER_NAME>-config-one
configTwo: <WORKLOAD_CLUSTER_NAME>-config-two
configOne: development-config-one
configTwo: development-config-two
21 changes: 21 additions & 0 deletions aws-github/registry/environments/production/docker-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: production-docker-config
spec:
refreshInterval: 10s
secretStoreRef:
name: vault-kv-secret
kind: ClusterSecretStore
target:
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .dockerconfig | toString }}"
name: docker-config
creationPolicy: Owner
data:
- secretKey: "dockerconfig"
remoteRef:
property: dockerconfig
key: dockerconfigjson
4 changes: 2 additions & 2 deletions aws-github/registry/environments/production/metaphor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ metadata:
finalizers:
- resources-finalizer.argocd.argoproj.io
annotations:
argocd.argoproj.io/sync-wave: '45'
argocd.argoproj.io/sync-wave: "45"
spec:
project: default
source:
repoURL: <GITOPS_REPO_URL>
path: registry/environments/production/metaphor
targetRevision: HEAD
destination:
name: <WORKLOAD_CLUSTER_NAME>
name: in-cluster
namespace: production
syncPolicy:
automated:
Expand Down
13 changes: 8 additions & 5 deletions aws-github/registry/environments/production/metaphor/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ metaphor:
className: nginx
enabled: true
annotations:
cert-manager.io/cluster-issuer: 'letsencrypt-prod'
<CERT_MANAGER_ISSUER_ANNOTATION_1>
<CERT_MANAGER_ISSUER_ANNOTATION_2>
<CERT_MANAGER_ISSUER_ANNOTATION_3>
<CERT_MANAGER_ISSUER_ANNOTATION_4>
nginx.ingress.kubernetes.io/service-upstream: "true"
hosts:
- host: metaphor-production.<DOMAIN_NAME>
Expand All @@ -26,8 +29,8 @@ metaphor:
host: https://metaphor-production.<DOMAIN_NAME>/api
console: https://kubefirst.<DOMAIN_NAME>

clusterSecretStoreName: <WORKLOAD_CLUSTER_NAME>-vault-kv-secret
vaultSecretPath: <WORKLOAD_CLUSTER_NAME>/metaphor
clusterSecretStoreName: vault-kv-secret
vaultSecretPath: production/metaphor
configs:
configOne: <WORKLOAD_CLUSTER_NAME>-config-one
configTwo: <WORKLOAD_CLUSTER_NAME>-config-two
configOne: production-config-one
configTwo: production-config-two
21 changes: 21 additions & 0 deletions aws-github/registry/environments/staging/docker-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: staging-docker-config
spec:
refreshInterval: 10s
secretStoreRef:
name: vault-kv-secret
kind: ClusterSecretStore
target:
template:
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .dockerconfig | toString }}"
name: docker-config
creationPolicy: Owner
data:
- secretKey: "dockerconfig"
remoteRef:
property: dockerconfig
key: dockerconfigjson
2 changes: 1 addition & 1 deletion aws-github/registry/environments/staging/metaphor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
path: registry/environments/staging/metaphor
targetRevision: HEAD
destination:
name: <WORKLOAD_CLUSTER_NAME>
name: in-cluster
namespace: staging
syncPolicy:
automated:
Expand Down
Loading