Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
aclevername committed Jul 13, 2023
2 parents 9db6acb + 2cde779 commit f740826
Show file tree
Hide file tree
Showing 3 changed files with 5,887 additions and 6,494 deletions.
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ configMapGenerator:
images:
- name: controller
newName: syntasso/kratix-platform
newTag: dev
newTag: 9929c0652d4e6778f3c4220f51ca02fa0df3c9b8
1 change: 0 additions & 1 deletion demo/demo-image-list
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ k8s.gcr.io/kube-controller-manager:v1.24.7
k8s.gcr.io/kube-proxy:v1.24.7
k8s.gcr.io/kube-scheduler:v1.24.7
minio/minio:RELEASE.2022-06-30T20-58-09Z
minio/mc:RELEASE.2023-06-06T13-48-56Z
nginx/nginx-ingress:2.4.2
quay.io/spotahome/redis-operator:v1.1.0
redis:6.2.6-alpine
Expand Down
Loading

0 comments on commit f740826

Please sign in to comment.