Fix deployment
This commit is contained in:
parent
79dd9a18d4
commit
3f5c97bf35
@ -9,7 +9,7 @@ metadata:
|
||||
namespace: platform
|
||||
spec:
|
||||
destination:
|
||||
namespace: badhouseplants-$ARGO_APP_NAMESPACE
|
||||
namespace: $ARGO_APP_NAMESPACE
|
||||
server: https://kubernetes.default.svc
|
||||
project: badhouseplants
|
||||
source:
|
||||
|
@ -11,14 +11,12 @@ spec:
|
||||
- '*'
|
||||
|
||||
destinations:
|
||||
- namespace: badhouseplants-*
|
||||
- namespace: development
|
||||
server: https://kubernetes.default.svc
|
||||
name: in-cluster
|
||||
- namespace: production
|
||||
server: https://kubernetes.default.svc
|
||||
name: in-cluster
|
||||
|
||||
# Deny all cluster-scoped resources from being created, except for Namespace
|
||||
clusterResourceWhitelist:
|
||||
- group: ''
|
||||
kind: Namespace
|
||||
|
||||
# Allow all namespaced-scoped resources to be created, except for ResourceQuota, LimitRange, NetworkPolicy
|
||||
namespaceResourceBlacklist:
|
||||
|
@ -18,9 +18,9 @@ chomp($remark_secret);
|
||||
$ENV{'ARGO_APP_CHART_VERSION'} = $chart_version;
|
||||
$ENV{'ARGO_APP_BRANCH'} = $git_branch;
|
||||
if ($git_branch eq $main_branch) {
|
||||
$ENV{'ARGO_APP_NAMESPACE'} = $git_branch;
|
||||
$ENV{'ARGO_APP_NAMESPACE'} = "production";
|
||||
} else {
|
||||
$ENV{'ARGO_APP_NAMESPACE'} = "preview"
|
||||
$ENV{'ARGO_APP_NAMESPACE'} = "development"
|
||||
}
|
||||
$ENV{'ARGO_APP_HOSTNAME'} = "$git_branch-dev.badhouseplants.net";
|
||||
$ENV{'ARGO_APP_IMAGE_TAG'} = $git_commit_sha;
|
||||
@ -72,4 +72,3 @@ foreach my $app (@all_applications) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user