From 4d2d4b99852ef634085f60b7b1a425419207b648 Mon Sep 17 00:00:00 2001 From: Shuting Zhao Date: Thu, 19 Nov 2020 12:31:08 -0800 Subject: [PATCH] Update install.yaml --- charts/kyverno/README.md | 4 ++-- charts/kyverno/values.yaml | 4 ++-- definitions/install.yaml | 4 ++-- definitions/kustomization.yaml | 12 ++++++------ definitions/manifest/deployment.yaml | 4 ++-- definitions/release/install.yaml | 4 ++-- scripts/ci.sh | 8 ++++---- scripts/install-cli.sh | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md index 85b3cffc64..f2bdfd24f0 100644 --- a/charts/kyverno/README.md +++ b/charts/kyverno/README.md @@ -73,10 +73,10 @@ Parameter | Description | Default `generatecontrollerExtraResources` | extra resource type Kyverno is allowed to generate | `[]` `image.pullPolicy` | Image pull policy | `IfNotPresent` `image.pullSecrets` | Specify image pull secrets | `[]` (does not add image pull secrets to deployed pods) -`image.repository` | Image repository | `nirmata/kyverno` +`image.repository` | Image repository | `ghcr.io/kyverno/kyverno` `image.tag` | Image tag | `nil` `initImage.pullPolicy` | Init image pull policy | `nil` -`initImage.repository` | Init image repository | `nirmata/kyvernopre` +`initImage.repository` | Init image repository | `ghcr.io/kyverno/kyvernopre` `initImage.tag` | Init image tag | `nil` `livenessProbe` | liveness probe configuration | `{}` `nameOverride` | override the name of the chart | `nil` diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml index f0c5734f93..950de72d1b 100644 --- a/charts/kyverno/values.yaml +++ b/charts/kyverno/values.yaml @@ -11,14 +11,14 @@ rbac: # example.com/annotation: value image: - repository: nirmata/kyverno + repository: ghcr.io/kyverno/kyverno # Defaults to appVersion in Chart.yaml if omitted tag: pullPolicy: IfNotPresent pullSecrets: [] # - secretName initImage: - repository: nirmata/kyvernopre + repository: ghcr.io/kyverno/kyvernopre # If initImage.tag is missing, defaults to image.tag tag: # If initImage.pullPolicy is missing, defaults to image.pullPolicy diff --git a/definitions/install.yaml b/definitions/install.yaml index 8c1eb20356..07cb14d1ad 100644 --- a/definitions/install.yaml +++ b/definitions/install.yaml @@ -3084,7 +3084,7 @@ spec: fieldPath: metadata.namespace - name: KYVERNO_SVC value: kyverno-svc - image: nirmata/kyverno:v1.3.0-rc2 + image: ghcr.io/kyverno/kyverno:v1.3.0-rc3 imagePullPolicy: Always livenessProbe: failureThreshold: 4 @@ -3127,7 +3127,7 @@ spec: runAsNonRoot: true runAsUser: 1000 initContainers: - - image: nirmata/kyvernopre:v1.3.0-rc2 + - image: ghcr.io/kyverno/kyvernopre:v1.3.0-rc3 imagePullPolicy: Always name: kyverno-pre securityContext: diff --git a/definitions/kustomization.yaml b/definitions/kustomization.yaml index 7a22d36ab0..c703caf607 100755 --- a/definitions/kustomization.yaml +++ b/definitions/kustomization.yaml @@ -6,9 +6,9 @@ resources: - ./manifest/ - ./k8s-resource/ images: -- name: nirmata/kyverno - newName: nirmata/kyverno - newTag: v1.3.0-rc2 -- name: nirmata/kyvernopre - newName: nirmata/kyvernopre - newTag: v1.3.0-rc2 +- name: ghcr.io/kyverno/kyverno + newName: ghcr.io/kyverno/kyverno + newTag: v1.3.0-rc3 +- name: ghcr.io/kyverno/kyvernopre + newName: ghcr.io/kyverno/kyvernopre + newTag: v1.3.0-rc3 diff --git a/definitions/manifest/deployment.yaml b/definitions/manifest/deployment.yaml index 25cf8dce9e..16e0fabb27 100755 --- a/definitions/manifest/deployment.yaml +++ b/definitions/manifest/deployment.yaml @@ -21,7 +21,7 @@ spec: runAsNonRoot: true initContainers: - name: kyverno-pre - image: nirmata/kyvernopre:v1.1.9 + image: ghcr.io/kyverno/kyvernopre:v1.1.9 imagePullPolicy: Always securityContext: runAsUser: 1000 @@ -34,7 +34,7 @@ spec: - all containers: - name: kyverno - image: nirmata/kyverno:latest + image: ghcr.io/kyverno/kyverno:latest imagePullPolicy: Always args: - "--filterK8Resources=[Event,*,*][*,kube-system,*][*,kube-public,*][*,kube-node-lease,*][Node,*,*][APIService,*,*][TokenReview,*,*][SubjectAccessReview,*,*][*,kyverno,*][Binding,*,*][ReplicaSet,*,*][ReportChangeRequest,*,*][ClusterReportChangeRequest,*,*][PolicyReport,*,*][ClusterPolicyReport,*,*]" diff --git a/definitions/release/install.yaml b/definitions/release/install.yaml index 8c1eb20356..07cb14d1ad 100755 --- a/definitions/release/install.yaml +++ b/definitions/release/install.yaml @@ -3084,7 +3084,7 @@ spec: fieldPath: metadata.namespace - name: KYVERNO_SVC value: kyverno-svc - image: nirmata/kyverno:v1.3.0-rc2 + image: ghcr.io/kyverno/kyverno:v1.3.0-rc3 imagePullPolicy: Always livenessProbe: failureThreshold: 4 @@ -3127,7 +3127,7 @@ spec: runAsNonRoot: true runAsUser: 1000 initContainers: - - image: nirmata/kyvernopre:v1.3.0-rc2 + - image: ghcr.io/kyverno/kyvernopre:v1.3.0-rc3 imagePullPolicy: Always name: kyverno-pre securityContext: diff --git a/scripts/ci.sh b/scripts/ci.sh index 40a8700c9e..cf263b4a60 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -11,8 +11,8 @@ chmod a+x $pwd/kind ## Create Kind Cluster $pwd/kind create cluster -$pwd/kind load docker-image nirmata/kyverno:$hash -$pwd/kind load docker-image nirmata/kyvernopre:$hash +$pwd/kind load docker-image ghcr.io/kyverno/kyverno:$hash +$pwd/kind load docker-image ghcr.io/kyverno/kyvernopre:$hash pwd=$(pwd) cd $pwd/definitions @@ -22,6 +22,6 @@ curl -sLO "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/ha bash ./install_kustomize.sh $latest chmod a+x $pwd/definitions/kustomize echo "Kustomize image edit" -$pwd/definitions/kustomize edit set image nirmata/kyverno:$hash -$pwd/definitions/kustomize edit set image nirmata/kyvernopre:$hash +$pwd/definitions/kustomize edit set image ghcr.io/kyverno/kyverno:$hash +$pwd/definitions/kustomize edit set image ghcr.io/kyverno/kyvernopre:$hash $pwd/definitions/kustomize build $pwd/definitions/ > $pwd/definitions/install.yaml \ No newline at end of file diff --git a/scripts/install-cli.sh b/scripts/install-cli.sh index d27b06737c..6b5b29b950 100755 --- a/scripts/install-cli.sh +++ b/scripts/install-cli.sh @@ -7,7 +7,7 @@ usage() { this=$1 cat <