Skip to content

Commit 427a442

Browse files
tmshorttmshort
committed
Move e2e registry resources into config
Currently, the e2e registry resources are located in a script `testdata/build-test-registry.sh` The resources in this script can be moved the the e2e config and manifests that now exist. The only thing that remains is the job, that kinda-sorta needs to wait until the registry is up and working. Signed-off-by: Todd Short <[email protected]>
1 parent b075ca2 commit 427a442

12 files changed

+255
-79
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ e2e-metrics: #EXHELP Request metrics from prometheus; place in ARTIFACT_PATH if
291291
http://localhost:30900/api/v1/query > $(if $(ARTIFACT_PATH),$(ARTIFACT_PATH),.)/metrics.out
292292

293293
.PHONY: extension-developer-e2e
294+
extension-developer-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)
294295
extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e
295296
extension-developer-e2e: export INSTALL_DEFAULT_CATALOGS := false
296297
extension-developer-e2e: run image-registry test-ext-dev-e2e kind-clean #EXHELP Run extension-developer e2e on local kind cluster
@@ -308,6 +309,7 @@ post-upgrade-checks:
308309
go test -count=1 -v ./test/upgrade-e2e/...
309310

310311
.PHONY: test-upgrade-e2e
312+
test-upgrade-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)
311313
test-upgrade-e2e: KIND_CLUSTER_NAME := operator-controller-upgrade-e2e
312314
test-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
313315
test-upgrade-e2e: export TEST_CLUSTER_EXTENSION_NAME := test-package

‎config/components/e2e/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
22
kind: Component
33
components:
44
- coverage
5-
- registries-conf
5+
- registry

‎config/components/e2e/registry/certificate.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: cert-manager.io/v1
2+
kind: Certificate
3+
metadata:
4+
name: operator-controller-e2e-registry
5+
namespace: operator-controller-e2e
6+
spec:
7+
secretName: operator-controller-e2e-registry
8+
isCA: true
9+
dnsNames:
10+
- docker-registry.operator-controller-e2e.svc
11+
- docker-registry.operator-controller-e2e.svc.cluster.local
12+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc
13+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc.cluster.local
14+
privateKey:
15+
algorithm: ECDSA
16+
size: 256
17+
issuerRef:
18+
name: olmv1-ca
19+
kind: ClusterIssuer
20+
group: cert-manager.io

‎config/components/e2e/registries-conf/registries_conf_configmap.yaml renamed to ‎config/components/e2e/registry/configmap.yaml

File renamed without changes.

‎config/components/e2e/registry/deployment.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: docker-registry
5+
namespace: operator-controller-e2e
6+
labels:
7+
app: registry
8+
spec:
9+
replicas: 1
10+
selector:
11+
matchLabels:
12+
app: registry
13+
template:
14+
metadata:
15+
labels:
16+
app: registry
17+
spec:
18+
containers:
19+
- name: registry
20+
image: registry:3
21+
imagePullPolicy: IfNotPresent
22+
volumeMounts:
23+
- name: certs-vol
24+
mountPath: "/certs"
25+
env:
26+
- name: REGISTRY_HTTP_ADDR
27+
value: ":5000"
28+
- name: REGISTRY_HTTP_TLS_CERTIFICATE
29+
value: "/certs/tls.crt"
30+
- name: REGISTRY_HTTP_TLS_KEY
31+
value: "/certs/tls.key"
32+
volumes:
33+
- name: certs-vol
34+
secret:
35+
secretName: operator-controller-e2e-registry

‎config/components/e2e/registries-conf/kustomization.yaml renamed to ‎config/components/e2e/registry/kustomization.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1alpha1
22
kind: Component
33
resources:
4-
- registries_conf_configmap.yaml
4+
- certificate.yaml
5+
- deployment.yaml
6+
- configmap.yaml
7+
- service.yaml
8+
- namespace.yaml
59
patches:
610
- path: manager_e2e_registries_conf_patch.yaml

‎config/components/e2e/registries-conf/manager_e2e_registries_conf_patch.yaml renamed to ‎config/components/e2e/registry/manager_e2e_registries_conf_patch.yaml

File renamed without changes.

‎config/components/e2e/registry/namespace.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: operator-controller-e2e

‎config/components/e2e/registry/service.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: docker-registry
5+
namespace: operator-controller-e2e
6+
spec:
7+
selector:
8+
app: registry
9+
ports:
10+
- name: http
11+
port: 5000
12+
targetPort: 5000
13+
nodePort: 30000
14+
type: NodePort

‎manifests/experimental-e2e.yaml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ metadata:
99
pod-security.kubernetes.io/enforce-version: latest
1010
name: olmv1-system
1111
---
12+
apiVersion: v1
13+
kind: Namespace
14+
metadata:
15+
annotations:
16+
olm.operatorframework.io/feature-set: experimental
17+
name: operator-controller-e2e
18+
---
1219
apiVersion: apiextensions.k8s.io/v1
1320
kind: CustomResourceDefinition
1421
metadata:
@@ -1596,6 +1603,23 @@ spec:
15961603
control-plane: operator-controller-controller-manager
15971604
---
15981605
apiVersion: v1
1606+
kind: Service
1607+
metadata:
1608+
annotations:
1609+
olm.operatorframework.io/feature-set: experimental
1610+
name: docker-registry
1611+
namespace: operator-controller-e2e
1612+
spec:
1613+
ports:
1614+
- name: http
1615+
nodePort: 30000
1616+
port: 5000
1617+
targetPort: 5000
1618+
selector:
1619+
app: registry
1620+
type: NodePort
1621+
---
1622+
apiVersion: v1
15991623
kind: PersistentVolumeClaim
16001624
metadata:
16011625
annotations:
@@ -1855,6 +1879,46 @@ spec:
18551879
optional: false
18561880
secretName: olmv1-cert
18571881
---
1882+
apiVersion: apps/v1
1883+
kind: Deployment
1884+
metadata:
1885+
annotations:
1886+
olm.operatorframework.io/feature-set: experimental
1887+
labels:
1888+
app: registry
1889+
name: docker-registry
1890+
namespace: operator-controller-e2e
1891+
spec:
1892+
replicas: 1
1893+
selector:
1894+
matchLabels:
1895+
app: registry
1896+
template:
1897+
metadata:
1898+
annotations:
1899+
olm.operatorframework.io/feature-set: experimental
1900+
labels:
1901+
app: registry
1902+
spec:
1903+
containers:
1904+
- env:
1905+
- name: REGISTRY_HTTP_ADDR
1906+
value: :5000
1907+
- name: REGISTRY_HTTP_TLS_CERTIFICATE
1908+
value: /certs/tls.crt
1909+
- name: REGISTRY_HTTP_TLS_KEY
1910+
value: /certs/tls.key
1911+
image: registry:3
1912+
imagePullPolicy: IfNotPresent
1913+
name: registry
1914+
volumeMounts:
1915+
- mountPath: /certs
1916+
name: certs-vol
1917+
volumes:
1918+
- name: certs-vol
1919+
secret:
1920+
secretName: operator-controller-e2e-registry
1921+
---
18581922
apiVersion: cert-manager.io/v1
18591923
kind: Certificate
18601924
metadata:
@@ -1919,6 +1983,29 @@ spec:
19191983
secretName: olmv1-cert
19201984
---
19211985
apiVersion: cert-manager.io/v1
1986+
kind: Certificate
1987+
metadata:
1988+
annotations:
1989+
olm.operatorframework.io/feature-set: experimental
1990+
name: operator-controller-e2e-registry
1991+
namespace: operator-controller-e2e
1992+
spec:
1993+
dnsNames:
1994+
- docker-registry.operator-controller-e2e.svc
1995+
- docker-registry.operator-controller-e2e.svc.cluster.local
1996+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc
1997+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc.cluster.local
1998+
isCA: true
1999+
issuerRef:
2000+
group: cert-manager.io
2001+
kind: ClusterIssuer
2002+
name: olmv1-ca
2003+
privateKey:
2004+
algorithm: ECDSA
2005+
size: 256
2006+
secretName: operator-controller-e2e-registry
2007+
---
2008+
apiVersion: cert-manager.io/v1
19222009
kind: ClusterIssuer
19232010
metadata:
19242011
annotations:

0 commit comments

Comments
 (0)