Skip to content

Commit ddb11b3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1173 from hongkailiu/test-renderManifest
NO-JIRA: Add unit test for renderManifest
2 parents 4ec8c48 + e543674 commit ddb11b3

File tree

2 files changed

+190
-0
lines changed

2 files changed

+190
-0
lines changed

‎pkg/payload/render_test.go

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package payload
2+
3+
import (
4+
"os"
5+
"strings"
6+
"testing"
7+
8+
"github.com/google/go-cmp/cmp"
9+
)
10+
11+
func TestRenderManifest(t *testing.T) {
12+
13+
tests := []struct {
14+
name string
15+
config manifestRenderConfig
16+
manifestFile string
17+
expectedManifestFile string
18+
expectedErr error
19+
}{
20+
{
21+
name: "cvo deployment",
22+
config: manifestRenderConfig{
23+
ReleaseImage: "quay.io/cvo/release:latest",
24+
ClusterProfile: "some-profile",
25+
},
26+
manifestFile: "../../install/0000_00_cluster-version-operator_03_deployment.yaml",
27+
expectedManifestFile: "./testdata/TestRenderManifest_expected_cvo_deployment.yaml",
28+
},
29+
}
30+
for _, tt := range tests {
31+
t.Run(tt.name, func(t *testing.T) {
32+
bytes, err := os.ReadFile(tt.manifestFile)
33+
if err != nil {
34+
t.Fatalf("failed to read manifest file: %v", err)
35+
}
36+
actual, actualErr := renderManifest(tt.config, bytes)
37+
if strings.ToLower(os.Getenv("UPDATE")) == "true" || actualErr != nil {
38+
if err := os.WriteFile(tt.expectedManifestFile, actual, 0644); err != nil {
39+
t.Fatalf("failed to update manifest file: %v", err)
40+
}
41+
}
42+
if diff := cmp.Diff(tt.expectedErr, actualErr, cmp.Comparer(func(x, y error) bool {
43+
if x == nil || y == nil {
44+
return x == nil && y == nil
45+
}
46+
return x.Error() == y.Error()
47+
})); diff != "" {
48+
t.Errorf("%s: the actual error differs from the expected (-want, +got): %s", tt.name, diff)
49+
} else {
50+
expected, err := os.ReadFile(tt.expectedManifestFile)
51+
if err != nil {
52+
t.Fatalf("failed to read expected manifest file: %v", err)
53+
}
54+
if diff := cmp.Diff(expected, actual); diff != "" {
55+
t.Errorf("%s: the actual does not match the expected (-want, +got): %s", tt.name, diff)
56+
}
57+
}
58+
})
59+
}
60+
}

‎pkg/payload/testdata/TestRenderManifest_expected_cvo_deployment.yaml

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: cluster-version-operator
5+
namespace: openshift-cluster-version
6+
annotations:
7+
kubernetes.io/description: The cluster-version operator manages OpenShift updates and reconciles core resources and cluster operators.
8+
exclude.release.openshift.io/internal-openshift-hosted: "true"
9+
include.release.openshift.io/self-managed-high-availability: "true"
10+
spec:
11+
selector:
12+
matchLabels:
13+
k8s-app: cluster-version-operator
14+
strategy:
15+
type: Recreate
16+
template:
17+
metadata:
18+
name: cluster-version-operator
19+
annotations:
20+
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
21+
openshift.io/required-scc: hostaccess
22+
labels:
23+
k8s-app: cluster-version-operator
24+
spec:
25+
automountServiceAccountToken: false
26+
containers:
27+
- name: cluster-version-operator
28+
image: quay.io/cvo/release:latest
29+
imagePullPolicy: IfNotPresent
30+
args:
31+
- "start"
32+
- "--release-image=quay.io/cvo/release:latest"
33+
- "--enable-auto-update=false"
34+
- "--listen=0.0.0.0:9099"
35+
- "--serving-cert-file=/etc/tls/serving-cert/tls.crt"
36+
- "--serving-key-file=/etc/tls/serving-cert/tls.key"
37+
- "--v=2"
38+
- "--always-enable-capabilities=Ingress"
39+
resources:
40+
requests:
41+
cpu: 20m
42+
memory: 50Mi
43+
terminationMessagePolicy: FallbackToLogsOnError
44+
volumeMounts:
45+
- mountPath: /etc/ssl/certs
46+
name: etc-ssl-certs
47+
readOnly: true
48+
- mountPath: /etc/cvo/updatepayloads
49+
name: etc-cvo-updatepayloads
50+
readOnly: true
51+
- mountPath: /etc/tls/serving-cert
52+
name: serving-cert
53+
readOnly: true
54+
- mountPath: /etc/tls/service-ca
55+
name: service-ca
56+
readOnly: true
57+
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
58+
name: kube-api-access
59+
readOnly: true
60+
env:
61+
# Unfortunately the placeholder is not replaced, reported as OCPBUGS-30080
62+
- name: OPERATOR_IMAGE_VERSION
63+
value: "0.0.1-snapshot"
64+
- name: KUBERNETES_SERVICE_PORT # allows CVO to communicate with apiserver directly on same host. Is substituted with port from infrastructures.status.apiServerInternalURL if available.
65+
value: "6443"
66+
- name: KUBERNETES_SERVICE_HOST # allows CVO to communicate with apiserver directly on same host. Is substituted with hostname from infrastructures.status.apiServerInternalURL if available.
67+
value: "127.0.0.1"
68+
- name: NODE_NAME
69+
valueFrom:
70+
fieldRef:
71+
fieldPath: spec.nodeName
72+
- name: CLUSTER_PROFILE
73+
value: some-profile
74+
# this pod is hostNetwork and uses the internal LB DNS name when possible, which the kubelet also uses.
75+
# this dnsPolicy allows us to use the same dnsConfig as the kubelet, without access to read it ourselves.
76+
dnsPolicy: Default
77+
hostNetwork: true
78+
nodeSelector:
79+
node-role.kubernetes.io/master: ""
80+
priorityClassName: "system-cluster-critical"
81+
terminationGracePeriodSeconds: 130
82+
tolerations:
83+
- key: "node-role.kubernetes.io/master"
84+
operator: Exists
85+
effect: "NoSchedule"
86+
- key: "node.kubernetes.io/network-unavailable"
87+
operator: Exists
88+
effect: "NoSchedule"
89+
- key: "node.kubernetes.io/not-ready"
90+
operator: "Exists"
91+
effect: "NoSchedule"
92+
- key: "node.kubernetes.io/unreachable"
93+
operator: "Exists"
94+
effect: "NoExecute"
95+
tolerationSeconds: 120
96+
- key: "node.kubernetes.io/not-ready"
97+
operator: "Exists"
98+
effect: "NoExecute"
99+
tolerationSeconds: 120
100+
volumes:
101+
- name: etc-ssl-certs
102+
hostPath:
103+
path: /etc/ssl/certs
104+
- name: etc-cvo-updatepayloads
105+
hostPath:
106+
path: /etc/cvo/updatepayloads
107+
- name: serving-cert
108+
secret:
109+
secretName: cluster-version-operator-serving-cert
110+
- name: service-ca
111+
configMap:
112+
name: openshift-service-ca.crt
113+
- name: kube-api-access
114+
projected:
115+
defaultMode: 420
116+
sources:
117+
- serviceAccountToken:
118+
expirationSeconds: 3600
119+
path: token
120+
- configMap:
121+
items:
122+
- key: ca.crt
123+
path: ca.crt
124+
name: kube-root-ca.crt
125+
- downwardAPI:
126+
items:
127+
- fieldRef:
128+
apiVersion: v1
129+
fieldPath: metadata.namespace
130+
path: namespace

0 commit comments

Comments
 (0)