adjusting flux resources

weaveworks · Oct 11, 2023 · 6aa0f17 · 6aa0f17
1 parent 3036396
commit 6aa0f17
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 33 deletions.
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -97,9 +97,8 @@ jobs:
 
     - name: Install violating-app
       run: |
-        kubectl create secret generic git-provider-credentials -n flux-system --from-literal=username="weave-gitops-bot" --from-literal=password="${{ secrets.WEAVEWORKS_BOT_TOKEN }}"
-        sed -i 's/BRANCH_NAME/${{ steps.extract_branch.outputs.branch_name }}/' ./utils/data/violating-podinfo-kustomization.yaml
         kubectl apply -f  ./utils/data/violating-podinfo-kustomization.yaml
+        flux reconcile kustomization -n default violating-podinfo --verbose
 
     - name: Install policies
       run: |

diff --git a/utils/data/shared-secrets-kustomization.yaml b/utils/data/shared-secrets-kustomization.yaml
diff --git a/utils/data/violating-podinfo-kustomization.yaml b/utils/data/violating-podinfo-kustomization.yaml
@@ -1,17 +1,4 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: flux-system
-  namespace: flux-system
-spec:
-  interval: 1m0s
-  ref:
-    branch: BRANCH_NAME
-  secretRef:
-    name: git-provider-credentials
-  url: https://github.com/weaveworks/playwright-tests.git
----
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:

diff --git a/utils/scripts/resources/flux-system-gitrepo.yaml b/utils/scripts/resources/flux-system-gitrepo.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: GitRepository
+metadata:
+  name: flux-system
+  namespace: flux-system
+spec:
+  interval: 1m0s
+  ref:
+    branch: BRANCH_NAME
+  secretRef:
+    name: git-provider-credentials
+  url: https://github.com/weaveworks/playwright-tests.git
diff --git a/utils/scripts/resources/shared-secrets-kustomization.yaml b/utils/scripts/resources/shared-secrets-kustomization.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:

diff --git a/utils/scripts/wego-enterprise.sh b/utils/scripts/wego-enterprise.sh
@@ -81,11 +81,14 @@ function setup {
 #  --from-literal=username=wego-admin \
 #  --from-literal=password=${CLUSTER_ADMIN_PASSWORD_HASH}
 
-
   kubectl apply -f ${args[1]}/resources/cluster-user-auth.yaml
 
-  kubectl apply -f ${args[1]}/resources/shared-secrets-kustomization.yaml
+  kubectl create secret generic git-provider-credentials -n flux-system --from-literal=username="weave-gitops-bot" --from-literal=password="${{ secrets.WEAVEWORKS_BOT_TOKEN }}"
+  sed -i 's/BRANCH_NAME/${{ steps.extract_branch.outputs.branch_name }}/' ${args[1]}/resources/flux-system-gitrepo.yaml
+  kubectl apply -f ${args[1]}/resources/flux-system-gitrepo.yaml
+  flux reconcile source git -n flux-system flux-system --verbose
 
+  kubectl apply -f ${args[1]}/resources/shared-secrets-kustomization.yaml
   flux reconcile kustomization -n flux-system shared-secrets --verbose
 
   # Choosing weave-gitops-enterprise chart version to install