Merge pull request #30 from fluxcd/source-controller-v0.0.1-alpha.6

Update source-controller to v0.0.1-alpha.6

Author: stefanprodan

.github/workflows/e2e.yaml

@@ -45,39 +45,38 @@ jobs:
           KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
       - name: Load test image
         run: kind load docker-image test/kustomize-controller:latest
-      - name: Deploy source-controller
+      - name: Deploy controllers
         run: |
-          kustomize build https://github.com/fluxcd/source-controller//config/default?ref=v0.0.1-alpha.4 | kubectl apply -f-
-          kubectl -n source-system rollout status deploy/source-controller --timeout=1m
-      - name: Deploy kustomize-controller
-        run: make dev-deploy IMG=test/kustomize-controller:latest
+          make dev-deploy IMG=test/kustomize-controller:latest
+          kubectl -n kustomize-system rollout status deploy/source-controller --timeout=1m
+          kubectl -n kustomize-system rollout status deploy/kustomize-controller --timeout=1m
         env:
           KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
       - name: Run overlays tests
         run: |
-          kubectl apply -k ./config/testdata/overlays
-          kubectl wait kustomizations/webapp-staging --for=condition=ready --timeout=4m
-          kubectl wait kustomizations/webapp-production --for=condition=ready --timeout=4m
+          kubectl -n kustomize-system apply -k ./config/testdata/overlays
+          kubectl -n kustomize-system wait kustomizations/webapp-staging --for=condition=ready --timeout=4m
+          kubectl -n kustomize-system wait kustomizations/webapp-production --for=condition=ready --timeout=4m
       - name: Run dependencies tests
         run: |
-          kubectl apply -k ./config/testdata/dependencies
-          kubectl wait kustomizations/common --for=condition=ready --timeout=4m
-          kubectl wait kustomizations/backend --for=condition=ready --timeout=4m
-          kubectl wait kustomizations/frontend --for=condition=ready --timeout=4m
+          kubectl -n kustomize-system apply -k ./config/testdata/dependencies
+          kubectl -n kustomize-system wait kustomizations/common --for=condition=ready --timeout=4m
+          kubectl -n kustomize-system wait kustomizations/backend --for=condition=ready --timeout=4m
+          kubectl -n kustomize-system wait kustomizations/frontend --for=condition=ready --timeout=4m
       - name: Run GC tests
         run: |
           kubectl get ns
-          kubectl delete -k ./config/testdata/overlays
+          kubectl -n kustomize-system delete -k ./config/testdata/overlays
           until kubectl get ns staging 2>&1 | grep NotFound ; do sleep 2; done
       - name: Logs
         run: |
-          kubectl -n source-system logs deploy/source-controller
+          kubectl -n kustomize-system logs deploy/source-controller
           kubectl -n kustomize-system logs deploy/kustomize-controller
       - name: Debug failure
         if: failure()
         run: |
-          kubectl get gitrepositories -oyaml
-          kubectl get kustomizations -oyaml
+          kubectl -n kustomize-system get gitrepositories -oyaml
+          kubectl -n kustomize-system get kustomizations -oyaml
           kubectl -n kustomize-system get all
-          kubectl -n source-system logs deploy/source-controller
+          kubectl -n kustomize-system logs deploy/source-controller
           kubectl -n kustomize-system logs deploy/kustomize-controller

README.md

@@ -59,7 +59,7 @@ apiVersion: source.fluxcd.io/v1alpha1
 kind: GitRepository
 metadata:
   name: podinfo
-  namespace: default
+  namespace: kustomize-system
 spec:
   interval: 1m
   url: https://github.com/stefanprodan/podinfo-deploy
@@ -92,6 +92,7 @@ apiVersion: kustomize.fluxcd.io/v1alpha1
 kind: Kustomization
 metadata:
   name: podinfo-dev
+  namespace: kustomize-system
 spec:
   interval: 5m
   path: "./overlays/dev/"
@@ -192,6 +193,7 @@ apiVersion: kustomize.fluxcd.io/v1alpha1
 kind: Kustomization
 metadata:
   name: istio
+  namespace: kustomize-system
 spec:
   interval: 10m
   path: "./profiles/default/"
@@ -208,6 +210,7 @@ apiVersion: kustomize.fluxcd.io/v1alpha1
 kind: Kustomization
 metadata:
   name: podinfo-dev
+  namespace: kustomize-system
 spec:
   dependsOn:
     - istio
@@ -228,6 +231,7 @@ apiVersion: source.fluxcd.io/v1alpha1
 kind: GitRepository
 metadata:
   name: podinfo-releases
+  namespace: kustomize-system
 spec:
   interval: 5m
   url: https://github.com/stefanprodan/podinfo-deploy
@@ -245,6 +249,7 @@ apiVersion: kustomize.fluxcd.io/v1alpha1
 kind: Kustomization
 metadata:
   name: podinfo-production
+  namespace: kustomize-system
 spec:
   interval: 10m
   path: "./overlays/production/"
@@ -267,6 +272,7 @@ apiVersion: kustomize.fluxcd.io/v1alpha1
 kind: Profile
 metadata:
   name: default
+  namespace: kustomize-system
 spec:
   alert:
     type: slack

config/default/kustomization.yaml

@@ -1,10 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kustomize-system
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager
-resources:
-  - namespace.yaml
-
+- github.com/fluxcd/source-controller/config//crd?ref=v0.0.1-alpha.6
+- github.com/fluxcd/source-controller/config//manager?ref=v0.0.1-alpha.6
+- namespace.yaml