Merge pull request #181 from weaveworks/1507-gitsources

Define policy library source name in weave policy agent profile

Author: waleedhammam

charts/weave-policy-agent/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: policy-agent
   repository: https://weaveworks.github.io/policy-agent
-  version: 1.0.0
-digest: sha256:fcebc5474323b1f9bfb4c69aeca70df90a9195ed22716cfb7e918e82b5d575bb
-generated: "2022-08-18T14:32:41.175031628+02:00"
+  version: 1.1.0
+digest: sha256:059e286d2d51653e6bd8bafe60538d2896d6ed62f9a66e7fe4288c912f7447db
+generated: "2022-09-20T15:05:23.605515697+02:00"

charts/weave-policy-agent/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 description: A Weaveworks Helm chart for Kubernetes to configure the policy agent
 name: weave-policy-agent
-appVersion: "1.0.0"
-version: 0.6.0
+appVersion: "1.1.0"
+version: 0.6.1
 kubeVersion: ">=1.16.0-0"
 icon: https://www.magalix.com/hubfs/Imported%20images/logo-02.png%3Fwidth=560%26name=logo-02-Dec-18-2020-11-24-41-75-AM.png
 type: application
@@ -28,5 +28,5 @@ annotations:
 
 dependencies:
   - name: policy-agent
-    version: "1.0.0"
+    version: "1.1.0"
     repository: "https://weaveworks.github.io/policy-agent"

charts/weave-policy-agent/templates/policy-library.yaml

@@ -1,9 +1,10 @@
 {{- if .Values.policySource.enabled }}
+{{- if not .Values.policySource.sourceRef }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
   name: policy-library
-  namespace: flux-system
+  namespace: {{ .Release.Namespace }}
 spec:
   interval: 10s
   url: {{ .Values.policySource.url }}
@@ -20,19 +21,24 @@ spec:
   secretRef:
     name: {{ .Values.policySource.secretRef }}
   {{- end }}
-
+{{- end }}
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
   name: policy-library
-  namespace: flux-system
+  namespace: {{ .Release.Namespace }}
 spec:
   interval: 10m0s
+  {{- if not .Values.policySource.sourceRef }}
   sourceRef:
     kind: GitRepository
     name: policy-library
-    namespace: flux-system
+    namespace: {{ .Release.Namespace }}
+  {{- else }}
+  sourceRef:
+{{- toYaml .Values.policySource.sourceRef | nindent 4 }}
+  {{- end }}
   path: {{ .Values.policySource.path }}
   prune: true
   validation: client

charts/weave-policy-agent/values.yaml

@@ -1,5 +1,4 @@
 policy-agent:
-  image: magalixcorp/policy-agent
   failurePolicy: Ignore
 
   # If you don't want to use cert-manager, set useCertManager to false and provide your own certs
@@ -42,3 +41,7 @@ policySource:
   # branch:
   # path: ./  # Could be a path to the policies dir or a kustomization.yaml file
   # secretRef: policy-library-auth  # (Optional): Name of the K8s secret with private repo auth credentials
+  # sourceRef: # Could specify a name for an existing GitSource reference instead of creating a new one
+  #   kind: GitRepository
+  #   name: policy-library
+  #   namespace: flux-system