Skip to content

Commit 5c0b959

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 7160b7f commit 5c0b959

File tree

11 files changed

+253
-79
lines changed

11 files changed

+253
-79
lines changed

‎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:
@@ -1854,6 +1878,46 @@ spec:
18541878
optional: false
18551879
secretName: olmv1-cert
18561880
---
1881+
apiVersion: apps/v1
1882+
kind: Deployment
1883+
metadata:
1884+
annotations:
1885+
olm.operatorframework.io/feature-set: experimental
1886+
labels:
1887+
app: registry
1888+
name: docker-registry
1889+
namespace: operator-controller-e2e
1890+
spec:
1891+
replicas: 1
1892+
selector:
1893+
matchLabels:
1894+
app: registry
1895+
template:
1896+
metadata:
1897+
annotations:
1898+
olm.operatorframework.io/feature-set: experimental
1899+
labels:
1900+
app: registry
1901+
spec:
1902+
containers:
1903+
- env:
1904+
- name: REGISTRY_HTTP_ADDR
1905+
value: :5000
1906+
- name: REGISTRY_HTTP_TLS_CERTIFICATE
1907+
value: /certs/tls.crt
1908+
- name: REGISTRY_HTTP_TLS_KEY
1909+
value: /certs/tls.key
1910+
image: registry:3
1911+
imagePullPolicy: IfNotPresent
1912+
name: registry
1913+
volumeMounts:
1914+
- mountPath: /certs
1915+
name: certs-vol
1916+
volumes:
1917+
- name: certs-vol
1918+
secret:
1919+
secretName: operator-controller-e2e-registry
1920+
---
18571921
apiVersion: cert-manager.io/v1
18581922
kind: Certificate
18591923
metadata:
@@ -1918,6 +1982,29 @@ spec:
19181982
secretName: olmv1-cert
19191983
---
19201984
apiVersion: cert-manager.io/v1
1985+
kind: Certificate
1986+
metadata:
1987+
annotations:
1988+
olm.operatorframework.io/feature-set: experimental
1989+
name: operator-controller-e2e-registry
1990+
namespace: operator-controller-e2e
1991+
spec:
1992+
dnsNames:
1993+
- docker-registry.operator-controller-e2e.svc
1994+
- docker-registry.operator-controller-e2e.svc.cluster.local
1995+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc
1996+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc.cluster.local
1997+
isCA: true
1998+
issuerRef:
1999+
group: cert-manager.io
2000+
kind: ClusterIssuer
2001+
name: olmv1-ca
2002+
privateKey:
2003+
algorithm: ECDSA
2004+
size: 256
2005+
secretName: operator-controller-e2e-registry
2006+
---
2007+
apiVersion: cert-manager.io/v1
19212008
kind: ClusterIssuer
19222009
metadata:
19232010
annotations:

‎manifests/standard-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: standard-e2e
17+
name: operator-controller-e2e
18+
---
1219
apiVersion: apiextensions.k8s.io/v1
1320
kind: CustomResourceDefinition
1421
metadata:
@@ -1589,6 +1596,23 @@ spec:
15891596
control-plane: operator-controller-controller-manager
15901597
---
15911598
apiVersion: v1
1599+
kind: Service
1600+
metadata:
1601+
annotations:
1602+
olm.operatorframework.io/feature-set: standard-e2e
1603+
name: docker-registry
1604+
namespace: operator-controller-e2e
1605+
spec:
1606+
ports:
1607+
- name: http
1608+
nodePort: 30000
1609+
port: 5000
1610+
targetPort: 5000
1611+
selector:
1612+
app: registry
1613+
type: NodePort
1614+
---
1615+
apiVersion: v1
15921616
kind: PersistentVolumeClaim
15931617
metadata:
15941618
annotations:
@@ -1842,6 +1866,46 @@ spec:
18421866
optional: false
18431867
secretName: olmv1-cert
18441868
---
1869+
apiVersion: apps/v1
1870+
kind: Deployment
1871+
metadata:
1872+
annotations:
1873+
olm.operatorframework.io/feature-set: standard-e2e
1874+
labels:
1875+
app: registry
1876+
name: docker-registry
1877+
namespace: operator-controller-e2e
1878+
spec:
1879+
replicas: 1
1880+
selector:
1881+
matchLabels:
1882+
app: registry
1883+
template:
1884+
metadata:
1885+
annotations:
1886+
olm.operatorframework.io/feature-set: standard-e2e
1887+
labels:
1888+
app: registry
1889+
spec:
1890+
containers:
1891+
- env:
1892+
- name: REGISTRY_HTTP_ADDR
1893+
value: :5000
1894+
- name: REGISTRY_HTTP_TLS_CERTIFICATE
1895+
value: /certs/tls.crt
1896+
- name: REGISTRY_HTTP_TLS_KEY
1897+
value: /certs/tls.key
1898+
image: registry:3
1899+
imagePullPolicy: IfNotPresent
1900+
name: registry
1901+
volumeMounts:
1902+
- mountPath: /certs
1903+
name: certs-vol
1904+
volumes:
1905+
- name: certs-vol
1906+
secret:
1907+
secretName: operator-controller-e2e-registry
1908+
---
18451909
apiVersion: cert-manager.io/v1
18461910
kind: Certificate
18471911
metadata:
@@ -1906,6 +1970,29 @@ spec:
19061970
secretName: olmv1-cert
19071971
---
19081972
apiVersion: cert-manager.io/v1
1973+
kind: Certificate
1974+
metadata:
1975+
annotations:
1976+
olm.operatorframework.io/feature-set: standard-e2e
1977+
name: operator-controller-e2e-registry
1978+
namespace: operator-controller-e2e
1979+
spec:
1980+
dnsNames:
1981+
- docker-registry.operator-controller-e2e.svc
1982+
- docker-registry.operator-controller-e2e.svc.cluster.local
1983+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc
1984+
- docker-registry-controller-manager-metrics-service.operator-controller-e2e.svc.cluster.local
1985+
isCA: true
1986+
issuerRef:
1987+
group: cert-manager.io
1988+
kind: ClusterIssuer
1989+
name: olmv1-ca
1990+
privateKey:
1991+
algorithm: ECDSA
1992+
size: 256
1993+
secretName: operator-controller-e2e-registry
1994+
---
1995+
apiVersion: cert-manager.io/v1
19091996
kind: ClusterIssuer
19101997
metadata:
19111998
annotations:

0 commit comments

Comments
 (0)