Skip to content

Commit fdec51e

Browse files
mjudeikismjudeikis
committed
clean
1 parent 77c917b commit fdec51e

File tree

2 files changed

+0
-256
lines changed

2 files changed

+0
-256
lines changed

‎pkg/cluster/hash_test.go

-84
Original file line numberDiff line numberDiff line change
@@ -32,74 +32,6 @@ func TestHashScaleSetStability(t *testing.T) {
3232
role api.AgentPoolProfileRole
3333
expectedHash string
3434
}{
35-
"v15.0": {
36-
{
37-
role: api.AgentPoolProfileRoleMaster,
38-
// this value should not change
39-
expectedHash: "fa0ba544c9f5f57f9ee68cfbdbd5d3d29a883fac252a0ec588cd0646272c729f",
40-
},
41-
{
42-
role: api.AgentPoolProfileRoleInfra,
43-
// this value should not change
44-
expectedHash: "b59dd4459ddf9775bebbf4547b180dcb4fe0a8b674fccc579bb56c840d423a1e",
45-
},
46-
{
47-
role: api.AgentPoolProfileRoleCompute,
48-
// this value should not change
49-
expectedHash: "d4b9e78ba42cdb4e178ab806013ad05651993fd30cb396521a88a242211d5621",
50-
},
51-
},
52-
"v16.1": {
53-
{
54-
role: api.AgentPoolProfileRoleMaster,
55-
// this value should not change
56-
expectedHash: "fa0ba544c9f5f57f9ee68cfbdbd5d3d29a883fac252a0ec588cd0646272c729f",
57-
},
58-
{
59-
role: api.AgentPoolProfileRoleInfra,
60-
// this value should not change
61-
expectedHash: "b59dd4459ddf9775bebbf4547b180dcb4fe0a8b674fccc579bb56c840d423a1e",
62-
},
63-
{
64-
role: api.AgentPoolProfileRoleCompute,
65-
// this value should not change
66-
expectedHash: "d4b9e78ba42cdb4e178ab806013ad05651993fd30cb396521a88a242211d5621",
67-
},
68-
},
69-
"v17.0": {
70-
{
71-
role: api.AgentPoolProfileRoleMaster,
72-
// this value should not change
73-
expectedHash: "fa0ba544c9f5f57f9ee68cfbdbd5d3d29a883fac252a0ec588cd0646272c729f",
74-
},
75-
{
76-
role: api.AgentPoolProfileRoleInfra,
77-
// this value should not change
78-
expectedHash: "b59dd4459ddf9775bebbf4547b180dcb4fe0a8b674fccc579bb56c840d423a1e",
79-
},
80-
{
81-
role: api.AgentPoolProfileRoleCompute,
82-
// this value should not change
83-
expectedHash: "d4b9e78ba42cdb4e178ab806013ad05651993fd30cb396521a88a242211d5621",
84-
},
85-
},
86-
"v19.0": {
87-
{
88-
role: api.AgentPoolProfileRoleMaster,
89-
// this value should not change
90-
expectedHash: "9c44ae2529186856b014569eadd07e166c81bbfa348c117d84f66efc827e6ef4",
91-
},
92-
{
93-
role: api.AgentPoolProfileRoleInfra,
94-
// this value should not change
95-
expectedHash: "b59dd4459ddf9775bebbf4547b180dcb4fe0a8b674fccc579bb56c840d423a1e",
96-
},
97-
{
98-
role: api.AgentPoolProfileRoleCompute,
99-
// this value should not change
100-
expectedHash: "d4b9e78ba42cdb4e178ab806013ad05651993fd30cb396521a88a242211d5621",
101-
},
102-
},
10335
"v20.0": {
10436
{
10537
role: api.AgentPoolProfileRoleMaster,
@@ -223,22 +155,6 @@ func TestHashSyncPodStability(t *testing.T) {
223155
tests := map[string]struct {
224156
expectedHash string
225157
}{
226-
"v15.0": {
227-
// this value should not change
228-
expectedHash: "5d4affe409e41f7fe5cf52af7968f5c96c911a9dfe34aad07b6d9575615ec2a8",
229-
},
230-
"v16.1": {
231-
// this value should not change
232-
expectedHash: "9bfc93fa779c54126768c6e369b4bdcfcf733e3a6d26d6701dbf04edd5ae663d",
233-
},
234-
"v17.0": {
235-
// this value should not change
236-
expectedHash: "99582cec01d5a3f6e4d875f34ed73dbaba5599e641d279864e53d0e979b70ca6",
237-
},
238-
"v19.0": {
239-
// this value should not change
240-
expectedHash: "9c88ca2e6bfd18f794948e6468c8d8ffc14f599c25407d9c15cb2db62b39bc92",
241-
},
242158
"v20.0": {
243159
// this value should not change
244160
expectedHash: "2a0838ac55163113989f9c7c39e50bb3c743cd6ecff1408a82e1001e4c152930",

‎pluginconfig/pluginconfig-311.yaml

-172
Original file line numberDiff line numberDiff line change
@@ -15,178 +15,6 @@ componentLogLevel:
1515
## having access to system nodes: default (any ip address)
1616
sshSourceAddressPrefixes: ["0.0.0.0/0"]
1717
versions:
18-
v15.0:
19-
imageOffer: osa
20-
imagePublisher: redhat
21-
imageSku: osa_311
22-
imageVersion: 311.161.20200115
23-
images:
24-
alertManager: registry.access.redhat.com/openshift3/prometheus-alertmanager:v3.11.161
25-
ansibleServiceBroker: registry.access.redhat.com/openshift3/ose-ansible-service-broker:v3.11.161
26-
clusterMonitoringOperator: registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator:v3.11.161
27-
configReloader: registry.access.redhat.com/openshift3/ose-configmap-reloader:v3.11.161
28-
console: registry.access.redhat.com/openshift3/ose-console:v3.11.161
29-
controlPlane: registry.access.redhat.com/openshift3/ose-control-plane:v3.11.161
30-
grafana: registry.access.redhat.com/openshift3/grafana:v3.11.161
31-
kubeRbacProxy: registry.access.redhat.com/openshift3/ose-kube-rbac-proxy:v3.11.161
32-
kubeStateMetrics: registry.access.redhat.com/openshift3/ose-kube-state-metrics:v3.11.161
33-
node: registry.access.redhat.com/openshift3/ose-node:v3.11.161
34-
nodeExporter: registry.access.redhat.com/openshift3/prometheus-node-exporter:v3.11.161
35-
oAuthProxy: registry.access.redhat.com/openshift3/oauth-proxy:v3.11.161
36-
prometheus: registry.access.redhat.com/openshift3/prometheus:v3.11.161
37-
prometheusConfigReloader: registry.access.redhat.com/openshift3/ose-prometheus-config-reloader:v3.11.161
38-
prometheusOperator: registry.access.redhat.com/openshift3/ose-prometheus-operator:v3.11.161
39-
registry: registry.access.redhat.com/openshift3/ose-docker-registry:v3.11.161
40-
registryConsole: registry.access.redhat.com/openshift3/registry-console:v3.11.161
41-
router: registry.access.redhat.com/openshift3/ose-haproxy-router:v3.11.161
42-
serviceCatalog: registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.161
43-
templateServiceBroker: registry.access.redhat.com/openshift3/ose-template-service-broker:v3.11.161
44-
webConsole: registry.access.redhat.com/openshift3/ose-web-console:v3.11.161
45-
format: registry.access.redhat.com/openshift3/ose-${component}:v3.11.161
46-
httpd: registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-108
47-
masterEtcd: registry.access.redhat.com/rhel7/etcd:3.2.26-22
48-
genevaLogging: osarpint.azurecr.io/acs/mdsd:master.20190228.1
49-
genevaStatsd: osarpint.azurecr.io/acs/mdm:git-a909a2e76
50-
genevaTDAgent: osarpint.azurecr.io/acs/td-agent:master.20190228.1
51-
logAnalyticsAgent: mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod12042019
52-
metricsServer: registry.access.redhat.com/openshift3/ose-metrics-server:v3.11.161
53-
azureControllers: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
54-
aroAdmissionController: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
55-
canary: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
56-
etcdBackup: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
57-
metricsBridge: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
58-
startup: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
59-
sync: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
60-
tlsProxy: osarpint.azurecr.io/openshift-on-azure/azure:v15.0
61-
v16.1:
62-
imageOffer: osa
63-
imagePublisher: redhat
64-
imageSku: osa_311
65-
imageVersion: 311.170.20200224
66-
images:
67-
alertManager: registry.access.redhat.com/openshift3/prometheus-alertmanager:v3.11.170
68-
ansibleServiceBroker: registry.access.redhat.com/openshift3/ose-ansible-service-broker:v3.11.170
69-
clusterMonitoringOperator: registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator:v3.11.170
70-
configReloader: registry.access.redhat.com/openshift3/ose-configmap-reloader:v3.11.170
71-
console: registry.access.redhat.com/openshift3/ose-console:v3.11.170
72-
controlPlane: registry.access.redhat.com/openshift3/ose-control-plane:v3.11.170
73-
grafana: registry.access.redhat.com/openshift3/grafana:v3.11.170
74-
kubeRbacProxy: registry.access.redhat.com/openshift3/ose-kube-rbac-proxy:v3.11.170
75-
kubeStateMetrics: registry.access.redhat.com/openshift3/ose-kube-state-metrics:v3.11.170
76-
node: registry.access.redhat.com/openshift3/ose-node:v3.11.170
77-
nodeExporter: registry.access.redhat.com/openshift3/prometheus-node-exporter:v3.11.170
78-
oAuthProxy: registry.access.redhat.com/openshift3/oauth-proxy:v3.11.170
79-
prometheus: registry.access.redhat.com/openshift3/prometheus:v3.11.170
80-
prometheusConfigReloader: registry.access.redhat.com/openshift3/ose-prometheus-config-reloader:v3.11.170
81-
prometheusOperator: registry.access.redhat.com/openshift3/ose-prometheus-operator:v3.11.170
82-
registry: registry.access.redhat.com/openshift3/ose-docker-registry:v3.11.170
83-
registryConsole: registry.access.redhat.com/openshift3/registry-console:v3.11.170
84-
router: registry.access.redhat.com/openshift3/ose-haproxy-router:v3.11.170
85-
serviceCatalog: registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.170
86-
templateServiceBroker: registry.access.redhat.com/openshift3/ose-template-service-broker:v3.11.170
87-
webConsole: registry.access.redhat.com/openshift3/ose-web-console:v3.11.170
88-
format: registry.access.redhat.com/openshift3/ose-${component}:v3.11.170
89-
httpd: registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-109
90-
masterEtcd: registry.access.redhat.com/rhel7/etcd:3.2.26-32
91-
genevaLogging: osarpint.azurecr.io/acs/mdsd:master.20190228.1
92-
genevaStatsd: osarpint.azurecr.io/acs/mdm:git-a909a2e76
93-
genevaTDAgent: osarpint.azurecr.io/acs/td-agent:master.20190228.1
94-
logAnalyticsAgent: mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03022020
95-
metricsServer: registry.access.redhat.com/openshift3/ose-metrics-server:v3.11.170
96-
azureControllers: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
97-
aroAdmissionController: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
98-
canary: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
99-
etcdBackup: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
100-
metricsBridge: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
101-
startup: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
102-
sync: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
103-
tlsProxy: osarpint.azurecr.io/openshift-on-azure/azure:v16.1
104-
v17.0:
105-
imageOffer: osa
106-
imagePublisher: redhat
107-
imageSku: osa_311
108-
imageVersion: 311.200.20200415
109-
images:
110-
alertManager: registry.access.redhat.com/openshift3/prometheus-alertmanager:v3.11.200
111-
ansibleServiceBroker: registry.access.redhat.com/openshift3/ose-ansible-service-broker:v3.11.200
112-
clusterMonitoringOperator: registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator:v3.11.200
113-
configReloader: registry.access.redhat.com/openshift3/ose-configmap-reloader:v3.11.200
114-
console: registry.access.redhat.com/openshift3/ose-console:v3.11.200
115-
controlPlane: registry.access.redhat.com/openshift3/ose-control-plane:v3.11.200
116-
grafana: registry.access.redhat.com/openshift3/grafana:v3.11.200
117-
kubeRbacProxy: registry.access.redhat.com/openshift3/ose-kube-rbac-proxy:v3.11.200
118-
kubeStateMetrics: registry.access.redhat.com/openshift3/ose-kube-state-metrics:v3.11.200
119-
node: registry.access.redhat.com/openshift3/ose-node:v3.11.200
120-
nodeExporter: registry.access.redhat.com/openshift3/prometheus-node-exporter:v3.11.200
121-
oAuthProxy: registry.access.redhat.com/openshift3/oauth-proxy:v3.11.200
122-
prometheus: registry.access.redhat.com/openshift3/prometheus:v3.11.200
123-
prometheusConfigReloader: registry.access.redhat.com/openshift3/ose-prometheus-config-reloader:v3.11.200
124-
prometheusOperator: registry.access.redhat.com/openshift3/ose-prometheus-operator:v3.11.200
125-
registry: registry.access.redhat.com/openshift3/ose-docker-registry:v3.11.200
126-
registryConsole: registry.access.redhat.com/openshift3/registry-console:v3.11.200
127-
router: registry.access.redhat.com/openshift3/ose-haproxy-router:v3.11.200
128-
serviceCatalog: registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.200
129-
templateServiceBroker: registry.access.redhat.com/openshift3/ose-template-service-broker:v3.11.200
130-
webConsole: registry.access.redhat.com/openshift3/ose-web-console:v3.11.200
131-
format: registry.access.redhat.com/openshift3/ose-${component}:v3.11.200
132-
httpd: registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-110
133-
masterEtcd: registry.access.redhat.com/rhel7/etcd:3.2.26-37
134-
genevaLogging: osarpint.azurecr.io/acs/mdsd:master.20190228.1
135-
genevaStatsd: osarpint.azurecr.io/acs/mdm:git-a909a2e76
136-
genevaTDAgent: osarpint.azurecr.io/acs/td-agent:master.20190228.1
137-
logAnalyticsAgent: mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod03022020
138-
metricsServer: registry.access.redhat.com/openshift3/ose-metrics-server:v3.11.200
139-
azureControllers: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
140-
aroAdmissionController: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
141-
canary: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
142-
etcdBackup: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
143-
metricsBridge: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
144-
startup: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
145-
sync: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
146-
tlsProxy: osarpint.azurecr.io/openshift-on-azure/azure:v17.0
147-
v19.0:
148-
imageOffer: osa
149-
imagePublisher: redhat
150-
imageSku: osa_311
151-
imageVersion: 311.232.20200629
152-
images:
153-
alertManager: registry.access.redhat.com/openshift3/prometheus-alertmanager:v3.11.232
154-
ansibleServiceBroker: registry.access.redhat.com/openshift3/ose-ansible-service-broker:v3.11.232
155-
clusterMonitoringOperator: registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator:v3.11.232
156-
configReloader: registry.access.redhat.com/openshift3/ose-configmap-reloader:v3.11.232
157-
console: registry.access.redhat.com/openshift3/ose-console:v3.11.232
158-
controlPlane: registry.access.redhat.com/openshift3/ose-control-plane:v3.11.232
159-
grafana: registry.access.redhat.com/openshift3/grafana:v3.11.232
160-
kubeRbacProxy: registry.access.redhat.com/openshift3/ose-kube-rbac-proxy:v3.11.232
161-
kubeStateMetrics: registry.access.redhat.com/openshift3/ose-kube-state-metrics:v3.11.232
162-
node: registry.access.redhat.com/openshift3/ose-node:v3.11.232
163-
nodeExporter: registry.access.redhat.com/openshift3/prometheus-node-exporter:v3.11.232
164-
oAuthProxy: registry.access.redhat.com/openshift3/oauth-proxy:v3.11.232
165-
prometheus: registry.access.redhat.com/openshift3/prometheus:v3.11.232
166-
prometheusConfigReloader: registry.access.redhat.com/openshift3/ose-prometheus-config-reloader:v3.11.232
167-
prometheusOperator: registry.access.redhat.com/openshift3/ose-prometheus-operator:v3.11.232
168-
registry: registry.access.redhat.com/openshift3/ose-docker-registry:v3.11.232
169-
registryConsole: registry.access.redhat.com/openshift3/registry-console:v3.11.232
170-
router: registry.access.redhat.com/openshift3/ose-haproxy-router:v3.11.232
171-
serviceCatalog: registry.access.redhat.com/openshift3/ose-service-catalog:v3.11.232
172-
templateServiceBroker: registry.access.redhat.com/openshift3/ose-template-service-broker:v3.11.232
173-
webConsole: registry.access.redhat.com/openshift3/ose-web-console:v3.11.232
174-
format: registry.access.redhat.com/openshift3/ose-${component}:v3.11.232
175-
httpd: registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-117.1593607199
176-
masterEtcd: registry.access.redhat.com/rhel7/etcd:3.2.28-12
177-
genevaLogging: osarpint.azurecr.io/acs/mdsd:master.20190228.1
178-
genevaStatsd: osarpint.azurecr.io/acs/mdm:git-a909a2e76
179-
genevaTDAgent: osarpint.azurecr.io/acs/td-agent:master.20190228.1
180-
logAnalyticsAgent: mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05262020
181-
metricsServer: registry.access.redhat.com/openshift3/ose-metrics-server:v3.11.232
182-
azureControllers: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
183-
aroAdmissionController: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
184-
canary: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
185-
etcdBackup: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
186-
metricsBridge: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
187-
startup: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
188-
sync: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
189-
tlsProxy: osarpint.azurecr.io/openshift-on-azure/azure:v19.0
19018
v20.0:
19119
imageOffer: osa
19220
imagePublisher: redhat

0 commit comments

Comments
 (0)