Skip to content

Commit 653d7b4

Browse files
committed
Revert the changes to make snc/crc image promoted.
After looking more closely about the workflow of crc and snc looks like even we able to use the image then also we can't resuse those for installer e2e test because we do need to recompile the crc binary with a bundle version. This reverts following commits. 7c58155 Add imagestreamimports resource for code-ready role 96672c8 Update ci-operator/step-registry/code-ready/snc/e2e/test/code-ready-snc-e2e-test-ref.yaml 61f354f Update ci-operator/step-registry/code-ready/crc/e2e/test/code-ready-crc-e2e-test-ref.yaml 18ccd99 Use promoted image with from_image cd6113c Add rbac for ci imagestream to code-ready namespace a53ea80 Add promotion for crc and snc config
1 parent 48f59be commit 653d7b4

File tree

7 files changed

+2
-138
lines changed

7 files changed

+2
-138
lines changed

ci-operator/config/code-ready/crc/code-ready-crc-master.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ images:
2424
as:
2525
- builder
2626
to: crc
27-
promotion:
28-
name: crc
29-
namespace: code-ready
3027
resources:
3128
'*':
3229
requests:

ci-operator/config/code-ready/snc/code-ready-snc-master.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ images:
1616
as:
1717
- builder
1818
to: snc
19-
promotion:
20-
name: snc
21-
namespace: code-ready
2219
resources:
2320
'*':
2421
requests:

ci-operator/jobs/code-ready/crc/code-ready-crc-master-postsubmits.yaml

Lines changed: 0 additions & 45 deletions
This file was deleted.

ci-operator/jobs/code-ready/snc/code-ready-snc-master-postsubmits.yaml

Lines changed: 0 additions & 45 deletions
This file was deleted.

ci-operator/step-registry/code-ready/crc/e2e/test/code-ready-crc-e2e-test-ref.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
ref:
22
as: code-ready-crc-e2e-test
3-
from_image:
4-
namespace: code-ready
5-
name: crc
6-
tag: crc
3+
from: crc
74
commands: code-ready-crc-e2e-test-commands.sh
85
resources:
96
requests:

ci-operator/step-registry/code-ready/snc/e2e/test/code-ready-snc-e2e-test-ref.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
ref:
22
as: code-ready-snc-e2e-test
3-
from_image:
4-
namespace: code-ready
5-
name: snc
6-
tag: snc
3+
from: snc
74
commands: code-ready-snc-e2e-test-commands.sh
85
resources:
96
requests:

core-services/various_rbac/admin_ci-operator_roles.yaml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -756,37 +756,3 @@ items:
756756
- kind: ServiceAccount
757757
name: ci-operator
758758
namespace: ci
759-
760-
- kind: Role
761-
apiVersion: rbac.authorization.k8s.io/v1
762-
metadata:
763-
name: image-tagger
764-
namespace: code-ready
765-
rules:
766-
- apiGroups:
767-
- ""
768-
- image.openshift.io
769-
attributeRestrictions: null
770-
resources:
771-
- imagestreamtags
772-
- imagestreams
773-
- imagestreamimports
774-
verbs:
775-
- update
776-
- patch
777-
- get
778-
- create
779-
780-
- kind: RoleBinding
781-
apiVersion: rbac.authorization.k8s.io/v1
782-
metadata:
783-
name: image-tagger-ci-operator
784-
namespace: code-ready
785-
roleRef:
786-
kind: Role
787-
name: image-tagger
788-
namespace: code-ready
789-
subjects:
790-
- kind: ServiceAccount
791-
name: ci-operator
792-
namespace: ci

0 commit comments

Comments
 (0)