Skip to content

Commit ab9a769

Browse files
committed
use new fkas
1 parent 564c27e commit ab9a769

File tree

3 files changed

+55
-2
lines changed

3 files changed

+55
-2
lines changed

test/e2e/config/e2e_conf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ variables:
213213
BMO_RELEASE_0.6: "data/bmo-deployment/overlays/release-0.6"
214214
BMO_RELEASE_LATEST: "data/bmo-deployment/overlays/release-latest"
215215
FKAS_RELEASE_LATEST: "data/fkas-deployment"
216+
FKAS_CERT_PATH: "data/cluster-template-centos-fake/secrets.yaml"
216217

217218
intervals:
218219
default/wait-controllers: ["10m", "10s"]
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
resources:
22
- ../bases/ippool
33
- ../bases/centos-kubeadm-config
4-
- secrets.yaml

test/e2e/pivoting_based_feature_test.go

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,60 @@ func createFakeTargetCluster(k8sVersion string) (framework.ClusterProxy, *cluste
204204
os.Setenv("CA_CERT_ENCODED", caCertEncoded)
205205
os.Setenv("ETCD_KEY_ENCODED", etcdKeyEncoded)
206206
os.Setenv("ETCD_CERT_ENCODED", etcdCertEncoded)
207-
cluster_endpoints, err :=http.Get("http://172.22.0.2:3333/register?resource=metal3/test1&caKey="+caKeyEncoded+"&caCert="+caCertEncoded+"&etcdKey="+etcdKeyEncoded+"&etcdCert="+etcdCertEncoded)
207+
By("Creating a Cluster CA Secret resource")
208+
secretClusterCA := &corev1.Secret{
209+
ObjectMeta: metav1.ObjectMeta{
210+
Name: clusterName+"-ca",
211+
Namespace: namespace,
212+
Labels: map[string]string{
213+
clusterv1.ClusterNameLabel: clusterName,
214+
},
215+
},
216+
Type: corev1.SecretTypeTLS,
217+
Data: map[string][]byte{
218+
"tls.crt": []byte(caCertEncoded),
219+
"tls.key": []byte(caKeyEncoded),
220+
},
221+
}
222+
223+
Expect(bootstrapClient.Create(ctx, secretClusterCA)).To(Succeed(), "should create Cluster CA Secret CR")
224+
By("Creating a ETCD CA Secret resource")
225+
secretClusterETCD := &corev1.Secret{
226+
ObjectMeta: metav1.ObjectMeta{
227+
Name: clusterName+"-etcd",
228+
Namespace: namespace,
229+
Labels: map[string]string{
230+
clusterv1.ClusterNameLabel: clusterName,
231+
},
232+
},
233+
Type: corev1.SecretTypeTLS,
234+
Data: map[string][]byte{
235+
"tls.crt": []byte(etcdCertEncoded),
236+
"tls.key": []byte(etcdKeyEncoded),
237+
},
238+
}
239+
240+
Expect(bootstrapClient.Create(ctx, secretClusterETCD)).To(Succeed(), "should create ETCD CA Secret CR")
241+
242+
type FKASCluster struct {
243+
resource string `json:"resource"`
244+
caKey string `json:"caKey"`
245+
caCert string `json:"caCert"`
246+
etcdKey string `json:"etcdKey"`
247+
etcdCert string `json:"etcdCert"`
248+
}
249+
fkasCluster := FKASCluster{
250+
resource: "'"+$namespace+"/"+clusterName+"'",
251+
caKey: caKey,
252+
caCert: caCert,
253+
etcdKey: etcdKey,
254+
etcdCert: etcdCert,
255+
}
256+
marshalled, err := json.Marshal(fkasCluster)
257+
if err != nil {
258+
log.Fatalf("impossible to marshall fkasCluster: %s", err)
259+
}
260+
cluster_endpoints, err :=http.Post("http://172.22.0.2:3333/register?resource=metal3/", bytes.NewReader(marshalled))
208261
check(err)
209262
defer cluster_endpoints.Body.Close()
210263
body, err := ioutil.ReadAll(cluster_endpoints.Body)

0 commit comments

Comments
 (0)