Merge pull request #58 from github/release-policy-controller-v0.10.0-…

…github7 Bump policy-controller version to v0.10.0-github7
github · Sep 18, 2024 · 41d9c2e · 41d9c2e
2 parents 289e61e + 21ff4ad
commit 41d9c2e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/charts/policy-controller/Chart.yaml b/charts/policy-controller/Chart.yaml
@@ -8,8 +8,8 @@ sources:
 type: application
 
 name: policy-controller
-version: "v0.10.0-github5"
-appVersion: "v0.10.0-github5"
+version: "v0.10.0-github7"
+appVersion: "v0.10.0-github7"
 
 maintainers:
   - name: codysoyland

diff --git a/charts/policy-controller/README.md b/charts/policy-controller/README.md
@@ -21,7 +21,7 @@ The Helm chart for Policy  Controller
 | installCRDs | bool | `true` |  |
 | leasescleanup.image.pullPolicy | string | `"IfNotPresent"` |  |
 | leasescleanup.image.repository | string | `"cgr.dev/chainguard/kubectl"` |  |
-| leasescleanup.image.version | string | `"latest-dev"` |  |
+| leasescleanup.image.version | string | `"sha256:dfa420c3fe94a8365b274fd714fb829b466cd762d6870d579db8744e6f27450a"` |  |
 | loglevel | string | `"info"` |  |
 | serviceMonitor.enabled | bool | `false` |  |
 | webhook.configData | object | `{}` |  |

diff --git a/charts/policy-controller/templates/_helpers.tpl b/charts/policy-controller/templates/_helpers.tpl
@@ -124,8 +124,12 @@ Create the image path for the passed in image field
 Create the image path for the passed in leases-cleanup image field
 */}}
 {{- define "leases-cleanup.image" -}}
+{{- if eq (substr 0 7 .version) "sha256:" -}}
+{{- printf "%s@%s" .repository .version -}}
+{{- else -}}
 {{- printf "%s:%s" .repository .version -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 */}}

diff --git a/charts/policy-controller/templates/crds/trustroots.yaml b/charts/policy-controller/templates/crds/trustroots.yaml
@@ -46,14 +46,17 @@ spec:
                   type: object
                   properties:
                     mirror:
-                      description: 'Mirror is the remote mirror, for example: https://sigstore-tuf-root.storage.googleapis.com'
+                      description: 'Mirror is the remote mirror, for example: https://tuf-repo-cdn.sigstore.dev'
                       type: string
                     root:
                       description: Root is the base64 encoded, json trusted initial root.
                       type: string
                     targets:
                       description: Targets is where the targets live off of the root of the Remote If not specified 'targets' is defaulted.
                       type: string
+                    trustedRootTarget:
+                      description: TrustedRootTarget is the name of the target containing the JSON trusted root. If not specified, `trusted_root.json` is used.
+                      type: string
                 repository:
                   description: Repository contains the serialized TUF remote repository.
                   type: object
@@ -67,6 +70,9 @@ spec:
                     targets:
                       description: Targets is where the targets live off of the root of the Repository above. If not specified 'targets' is defaulted.
                       type: string
+                    trustedRootTarget:
+                      description: TrustedRootTarget is the name of the target containing the JSON trusted root. If not specified, `trusted_root.json` is used.
+                      type: string
                 sigstoreKeys:
                   description: SigstoreKeys contains the serialized keys.
                   type: object

diff --git a/charts/policy-controller/values.yaml b/charts/policy-controller/values.yaml
@@ -16,8 +16,8 @@ webhook:
   name: webhook
   image:
     repository: ghcr.io/github/policy-controller-webhook
-    # crane digest ghcr.io/github/policy-controller-webhook:v0.10.0-github5
-    version: sha256:048a124b6f287a742956006730844ff5553d00bc12ec99ed1793480d7fbec814
+    # crane digest ghcr.io/github/policy-controller-webhook:v0.10.0-github7
+    version: sha256:0bc1630678ffb1623c139d6f0cfdb512a2041033ec94c83a3820f7eddd6b0aab
     pullPolicy: IfNotPresent
   env: {}
   extraArgs: {}
@@ -70,7 +70,8 @@ webhook:
 leasescleanup:
   image:
     repository: cgr.dev/chainguard/kubectl
-    version: latest-dev
+    # crane digest cgr.dev/chainguard/kubectl:latest
+    version: sha256:dfa420c3fe94a8365b274fd714fb829b466cd762d6870d579db8744e6f27450a
     pullPolicy: IfNotPresent
 
 ## common node selector for all the pods