diff --git a/doc/source/cli/cli-etsi-vnfpkgm.rst b/doc/source/cli/cli-etsi-vnfpkgm.rst index 043b8df6d..125c9b1a4 100644 --- a/doc/source/cli/cli-etsi-vnfpkgm.rst +++ b/doc/source/cli/cli-etsi-vnfpkgm.rst @@ -332,7 +332,7 @@ Result: | | { | | | "artifactPath": "Files/kubernetes/deployment.yaml", | | | "checksum": { | - | | "hash": "e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2", | + | | "hash": "8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1", | | | "algorithm": "SHA-256" | | | }, | | | "metadata": {} | diff --git a/doc/source/user/etsi_containerized_vnf_usage_guide.rst b/doc/source/user/etsi_containerized_vnf_usage_guide.rst index 3327ff076..fd217372e 100644 --- a/doc/source/user/etsi_containerized_vnf_usage_guide.rst +++ b/doc/source/user/etsi_containerized_vnf_usage_guide.rst @@ -339,9 +339,9 @@ The following is a simple example of ``deployment`` resource. ports: - containerPort: 80 protocol: TCP - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent - name: kuryr-demo-readiness-probe + name: nginx-readiness-probe ports: - containerPort: 8080 protocol: TCP diff --git a/doc/source/user/mgmt_driver_for_container_update.rst b/doc/source/user/mgmt_driver_for_container_update.rst index 6680b34ee..a8e5220a6 100644 --- a/doc/source/user/mgmt_driver_for_container_update.rst +++ b/doc/source/user/mgmt_driver_for_container_update.rst @@ -810,7 +810,7 @@ The resources information after update: deployment2-vdu6-86579d6868 1 1 1 38m nginx nginx app=webserver,pod-template-hash=86579d6868 vdu1-update-5d87858fc6 1 1 1 18m nginx cirros app=webserver,pod-template-hash=5d87858fc6 vdu1-update-6fcf66b5dd 0 0 0 38m nginx nginx app=webserver,pod-template-hash=6fcf66b5dd - vdu2-update 1 1 1 38m nginx celebdor/kuryr-demo app=webserver + vdu2-update 1 1 1 38m nginx nginx app=webserver $ $ kubectl describe pod vdu2-update-z4t48 Name: vdu2-update-z4t48 @@ -819,8 +819,8 @@ The resources information after update: Containers: nginx: Container ID: cri-o://4909dcdf39e101535a603ff5263298f3e52c5993d3822f3a0750860d889f6ebc - Image: celebdor/kuryr-demo - Image ID: docker.io/celebdor/kuryr-demo@sha256:74102005010b28a4518e08215df992a46b27ffc8b50836f29d8f9c0d7c9d4135 + Image: nginx + Image ID: docker.io/library/nginx@sha256:161ef4b1bf7effb350a2a9625cb2b59f69d54ec6059a8a155a1438d0439c593c ... Volumes: cm-volume: diff --git a/doc/source/user/v2/cnf/update_with_mgmt_driver/index.rst b/doc/source/user/v2/cnf/update_with_mgmt_driver/index.rst index 53e60eef7..c20646389 100644 --- a/doc/source/user/v2/cnf/update_with_mgmt_driver/index.rst +++ b/doc/source/user/v2/cnf/update_with_mgmt_driver/index.rst @@ -830,7 +830,7 @@ The resources information after update: deployment2-vdu6-86579d6868 1 1 1 131m nginx nginx app=webserver,pod-template-hash=86579d6868 vdu1-update-5d87858fc6 1 1 1 37m nginx cirros app=webserver,pod-template-hash=5d87858fc6 vdu1-update-6fcf66b5dd 0 0 0 131m nginx nginx app=webserver,pod-template-hash=6fcf66b5dd - vdu2-update 1 1 1 131m nginx celebdor/kuryr-demo app=webserver + vdu2-update 1 1 1 131m nginx nginx app=webserver $ kubectl describe pod vdu2-update-tk7qp Name: vdu2-update-tk7qp @@ -839,8 +839,8 @@ The resources information after update: Containers: nginx: Container ID: cri-o://05f13a7b7d171e2d68bcbceefbce0537b851bd0f0f7de60fba0d9500349d6f4d - Image: celebdor/kuryr-demo - Image ID: docker.io/celebdor/kuryr-demo@sha256:74102005010b28a4518e08215df992a46b27ffc8b50836f29d8f9c0d7c9d4135 + Image: nginx + Image ID: docker.io/library/nginx@sha256:86e53c4c16a6a276b204b0fd3a8143d86547c967dc8258b3d47c3a21bb68d3c6 ... Volumes: cm-volume: diff --git a/roles/setup-k8s-nodes/tasks/main.yaml b/roles/setup-k8s-nodes/tasks/main.yaml index 05a86d58c..30660838e 100644 --- a/roles/setup-k8s-nodes/tasks/main.yaml +++ b/roles/setup-k8s-nodes/tasks/main.yaml @@ -29,7 +29,6 @@ - "docker.io" - "k8s.gcr.io" - "quay.io" - - "celebdor" become: yes when: - inventory_hostname == 'controller-k8s' diff --git a/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/Files/kubernetes/deployment.yaml b/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/Files/kubernetes/deployment.yaml index 43abf2722..e0e4b1fae 100644 --- a/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/Files/kubernetes/deployment.yaml +++ b/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/Files/kubernetes/deployment.yaml @@ -21,8 +21,8 @@ spec: imagePullPolicy: IfNotPresent ports: - containerPort: 80 - - name: kuryr-demo - image: celebdor/kuryr-demo + - name: nginx-2 + image: nginx imagePullPolicy: IfNotPresent ports: - containerPort: 8080 \ No newline at end of file diff --git a/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/TOSCA-Metadata/TOSCA.meta b/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/TOSCA-Metadata/TOSCA.meta index c6577338d..1f935d98c 100644 --- a/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/TOSCA-Metadata/TOSCA.meta +++ b/samples/mgmt_driver/kubernetes/kubespray/cnf_nodeport_setting/cnf_nodeport_setting_vnf_package/TOSCA-Metadata/TOSCA.meta @@ -6,7 +6,7 @@ Entry-Definitions: Definitions/helloworld3_top.vnfd.yaml Name: Files/kubernetes/deployment.yaml Content-Type: application/yaml Algorithm: SHA-256 -Hash: 3e87eebb432c3ff59f54d6dddd12a7adff3b8d7b1e272d5b5de3df5ae9aec4d4 +Hash: 0cd2f3d0c41cf5e59849c2a8fbb7c14b563d72d115c89e71d0201b715b6fc306 Name: Files/kubernetes/service_with_nodeport.yaml Content-Type: application/yaml diff --git a/samples/tests/etc/samples/etsi/nfv/common/Files/kubernetes/deployment.yaml b/samples/tests/etc/samples/etsi/nfv/common/Files/kubernetes/deployment.yaml index 1ef42fa1f..a394cf200 100644 --- a/samples/tests/etc/samples/etsi/nfv/common/Files/kubernetes/deployment.yaml +++ b/samples/tests/etc/samples/etsi/nfv/common/Files/kubernetes/deployment.yaml @@ -26,7 +26,7 @@ spec: configMapKeyRef: key: param1 name: curry-test001 - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/Files/kubernetes/testdata_artifact_file_content.yaml b/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/Files/kubernetes/testdata_artifact_file_content.yaml index 4a973e009..7ca25dded 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/Files/kubernetes/testdata_artifact_file_content.yaml +++ b/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/Files/kubernetes/testdata_artifact_file_content.yaml @@ -7,7 +7,7 @@ metadata: role: my-curry spec: containers: - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent name: local ports: diff --git a/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta b/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta index f1e8cb14a..7acc71cad 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta +++ b/samples/tests/etc/samples/etsi/nfv/sample_kubernetes_driver/TOSCA-Metadata/TOSCA.meta @@ -19,4 +19,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Name: Files/kubernetes/deployment.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false/manifest.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_meta_and_manifest_false_hash/manifest.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF1.mf b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF1.mf index a213f17a9..a21397e33 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF1.mf +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_in_single_manifest_false_name/VNF1.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_manifest/VNF.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf +++ b/samples/tests/etc/samples/etsi/nfv/sample_vnf_package_csar_meta_in_manifest/manifest.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment.yaml index 484d42ac7..035638890 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment.yaml @@ -21,9 +21,9 @@ spec: ports: - containerPort: 80 protocol: TCP - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent - name: kuryr-demo-readiness-probe + name: nginx-readiness-probe ports: - containerPort: 8080 protocol: TCP \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap1.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap1.yaml index 5983a1c99..05917055d 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap1.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap1.yaml @@ -21,9 +21,9 @@ spec: ports: - containerPort: 80 protocol: TCP - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent - name: kuryr-demo-readiness-probe + name: nginx-readiness-probe ports: - containerPort: 8080 protocol: TCP \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap2.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap2.yaml index cc8407001..70919f9f3 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap2.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/deployment_vdumap2.yaml @@ -21,9 +21,9 @@ spec: ports: - containerPort: 80 protocol: TCP - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent - name: kuryr-demo-readiness-probe + name: nginx-readiness-probe ports: - containerPort: 8080 protocol: TCP \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/job.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/job.yaml index 7d4e53c7f..e8d2698d4 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/job.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/job.yaml @@ -19,7 +19,7 @@ spec: - command: ["sh", "-c"] args: - echo CURRY - image: celebdor/kuryr-demo + image: nginx name: curryjob restartPolicy: OnFailure status: {} \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod-template.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod-template.yaml index cd45503b9..445ff5751 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod-template.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod-template.yaml @@ -21,7 +21,7 @@ template: configMapKeyRef: key: param1 name: curry-test001 - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod.yaml index 56ce7280d..63227f4ff 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/Files/kubernetes/pod.yaml @@ -5,7 +5,7 @@ metadata: name: vdu1 spec: containers: - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta b/samples/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta index 7e5c7946a..15ba2beae 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf/TOSCA-Metadata/TOSCA.meta @@ -31,7 +31,7 @@ Hash: f8ed04536a8795af4828b2f731225abc34986f9ea30237d9652669ca57d9d217 Name: Files/kubernetes/deployment.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 80f160c9bdd9daa6d0111c8d40b5575946b8c0f23696aa8d91d20f313adae087 +Hash: b747cc056df9155822a2046946eeee036cb73bc81ab985f12e70645d7c45ae9d Name: Files/kubernetes/horizontal-pod-autoscaler.yaml Content-Type: test-data @@ -41,7 +41,7 @@ Hash: e0fcd3fe107ede4c21d436afbc28455a9c60909bf67f27886c88b379ca529e09 Name: Files/kubernetes/job.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: be7239275d10915eec462634247daf3b7f6a95b22c4027c614b2359688565931 +Hash: 30222ee1099883e1e9938e36411b320869cd970900e20fe4d1f53afffcf4a558 Name: Files/kubernetes/limit-range.yaml Content-Type: test-data @@ -86,12 +86,12 @@ Hash: 934bb29d10c75053c244c9acb1cb259c4a5616dbe931a02da8072322aa76cabc Name: Files/kubernetes/pod-template.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 5d4d3d399e04cdba1f9c691ac7e690e295ff02b7c935abae873b68a83a858c50 +Hash: e49c800645ab733930ba471523f738c1f139f4fbd798a9ac403b2b8982b70cfe Name: Files/kubernetes/pod.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 6c97b1a8fc8d21a6a9e7ab1c383b49d3ec31f79a83de218f5537d18531ddfbd8 +Hash: 7d697084d81ecf77eeb628882cef223106cdf270caa5d46ce92efbc4b0334b7b Name: Files/kubernetes/replicaset_service_secret.yaml Content-Type: test-data @@ -146,9 +146,9 @@ Hash: 71a99017964b8ce1dfbbade92f3cdf42f1e5b774c6e7edb7aa83c5eee42e5d5e Name: Files/kubernetes/deployment_vdumap1.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: a266edaa404d080b7e2d6eb9dc17fdefdf0449ae8189487e0746141e0424603d +Hash: c67770059ee39fab1d26cf76548ea2948bc91fe099005527a3b7d2f138391d46 Name: Files/kubernetes/deployment_vdumap2.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: a847e345e1d7120b53f1d27b3bbfec38b86780ed67d4780d0934352304b25ab4 +Hash: bda73240422fdcff4130688106aa533bac3a88b8cb2720ead9f7c4068c669b4e diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Files/kubernetes/replicaset.yaml b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Files/kubernetes/replicaset.yaml index 57cc24f4f..27989e5ea 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Files/kubernetes/replicaset.yaml +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/Files/kubernetes/replicaset.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: nginx - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent ports: - containerPort: 180 diff --git a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/TOSCA-Metadata/TOSCA.meta b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/TOSCA-Metadata/TOSCA.meta index fbe772a49..e3a40df30 100644 --- a/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/TOSCA-Metadata/TOSCA.meta +++ b/samples/tests/etc/samples/etsi/nfv/test_cnf_container_update_after/TOSCA-Metadata/TOSCA.meta @@ -51,7 +51,7 @@ Hash: 5e29e35c849b2b8677efe8d6ec8554d638481bd41b4705856382698d96bcb040 Name: Files/kubernetes/replicaset.yaml Content-Type: application/yaml Algorithm: SHA-256 -Hash: 933f8d8d3a85b3dfed1b2ea72270104fd8930894615792843a649bd82963fe07 +Hash: 801808e8ed7c6a93429f737c5b7a7fb5afb7cb319763f005d98d7c50a46374c9 Name: Files/kubernetes/secret_2.yaml Content-Type: application/yaml diff --git a/samples/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta b/samples/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta index f1e8cb14a..7acc71cad 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta +++ b/samples/tests/etc/samples/etsi/nfv/vnfpkgm1/TOSCA-Metadata/TOSCA.meta @@ -19,4 +19,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Name: Files/kubernetes/deployment.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 \ No newline at end of file diff --git a/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf b/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf +++ b/samples/tests/etc/samples/etsi/nfv/vnfpkgm2/manifest.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf b/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf index 02cb15525..1b6948009 100644 --- a/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf +++ b/samples/tests/etc/samples/etsi/nfv/vnfpkgm3/vnfd_helloworld_single.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/kubernetes/deployment.yaml b/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/kubernetes/deployment.yaml index 1ef42fa1f..a394cf200 100755 --- a/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/kubernetes/deployment.yaml +++ b/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/Files/kubernetes/deployment.yaml @@ -26,7 +26,7 @@ spec: configMapKeyRef: key: param1 name: curry-test001 - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf b/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf index dbfea8176..9501ecdd7 100755 --- a/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf +++ b/samples/tests/etc/samples/sample_vnf_package_csar_in_meta_and_manifest/manifest.mf @@ -8,4 +8,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 diff --git a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Files/kubernetes/replicaset.yaml b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Files/kubernetes/replicaset.yaml index 57cc24f4f..27989e5ea 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Files/kubernetes/replicaset.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/Files/kubernetes/replicaset.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: nginx - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent ports: - containerPort: 180 diff --git a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/TOSCA-Metadata/TOSCA.meta b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/TOSCA-Metadata/TOSCA.meta index dc845d591..9ee44ee21 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/TOSCA-Metadata/TOSCA.meta +++ b/samples/tests/functional/sol_kubernetes_v2/test_cnf_container_update_after/contents/TOSCA-Metadata/TOSCA.meta @@ -51,7 +51,7 @@ Hash: 5e29e35c849b2b8677efe8d6ec8554d638481bd41b4705856382698d96bcb040 Name: Files/kubernetes/replicaset.yaml Content-Type: application/yaml Algorithm: SHA-256 -Hash: 933f8d8d3a85b3dfed1b2ea72270104fd8930894615792843a649bd82963fe07 +Hash: 801808e8ed7c6a93429f737c5b7a7fb5afb7cb319763f005d98d7c50a46374c9 Name: Files/kubernetes/secret_2.yaml Content-Type: application/yaml diff --git a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/job.yaml b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/job.yaml index f73b1a560..dabb2b6bf 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/job.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/job.yaml @@ -19,7 +19,7 @@ spec: - command: ["sh", "-c"] args: - echo CURRY - image: celebdor/kuryr-demo + image: nginx resources: limits: memory: "20Mi" diff --git a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod-template.yaml b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod-template.yaml index cd45503b9..445ff5751 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod-template.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod-template.yaml @@ -21,7 +21,7 @@ template: configMapKeyRef: key: param1 name: curry-test001 - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod.yaml b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod.yaml index 353879a37..5f4396d90 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod.yaml +++ b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/Files/kubernetes/pod.yaml @@ -5,7 +5,7 @@ metadata: name: vdu1 spec: containers: - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent name: web-server resources: diff --git a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta index a979859cd..58389f6b2 100644 --- a/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta +++ b/samples/tests/functional/sol_kubernetes_v2/test_instantiate_cnf_resources/contents/TOSCA-Metadata/TOSCA.meta @@ -46,7 +46,7 @@ Hash: e0fcd3fe107ede4c21d436afbc28455a9c60909bf67f27886c88b379ca529e09 Name: Files/kubernetes/job.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 68fbadafed2a325231cb7d8cf70823611de422669c6e42029ba7d51cace0b978 +Hash: 13333ab023c38ec35b86b7d069b3f9905a960acba61d7e4b6e6eec9a4ff8262c Name: Files/kubernetes/limit-range.yaml Content-Type: test-data @@ -91,12 +91,12 @@ Hash: 934bb29d10c75053c244c9acb1cb259c4a5616dbe931a02da8072322aa76cabc Name: Files/kubernetes/pod-template.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 5d4d3d399e04cdba1f9c691ac7e690e295ff02b7c935abae873b68a83a858c50 +Hash: e49c800645ab733930ba471523f738c1f139f4fbd798a9ac403b2b8982b70cfe Name: Files/kubernetes/pod.yaml Content-Type: test-data Algorithm: SHA-256 -Hash: 766f27b71a25922a95f847a1b490bf80c3a1a00a2574dee058555602e4da0555 +Hash: f209377ea169abbceecc4f0b5c37cd686cc37e5dc03a668c06793692a63c5954 Name: Files/kubernetes/replicaset_service_secret.yaml Content-Type: test-data diff --git a/samples/tests/unit/sol_refactored/samples/sample1/manifest.mf b/samples/tests/unit/sol_refactored/samples/sample1/manifest.mf index 533618cec..aecd94a81 100644 --- a/samples/tests/unit/sol_refactored/samples/sample1/manifest.mf +++ b/samples/tests/unit/sol_refactored/samples/sample1/manifest.mf @@ -4,4 +4,4 @@ Hash: 27bbdb25d8f4ed6d07d6f6581b86515e8b2f0059b236ef7b6f50d6674b34f02a Source: Files/kubernetes/deployment.yaml Algorithm: SHA-256 -Hash: e23cc3433835cea32ce790b4823313dc6d0744dce02e27b1b339c87ee993b8c2 \ No newline at end of file +Hash: 8115e59f56044a44f472964312f0f0770f465f5c734d70ea7061bdf0b5f28ca1 \ No newline at end of file diff --git a/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/job.yaml b/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/job.yaml index 7d4e53c7f..e8d2698d4 100644 --- a/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/job.yaml +++ b/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/job.yaml @@ -19,7 +19,7 @@ spec: - command: ["sh", "-c"] args: - echo CURRY - image: celebdor/kuryr-demo + image: nginx name: curryjob restartPolicy: OnFailure status: {} \ No newline at end of file diff --git a/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod-template.yaml b/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod-template.yaml index cd45503b9..445ff5751 100644 --- a/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod-template.yaml +++ b/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod-template.yaml @@ -21,7 +21,7 @@ template: configMapKeyRef: key: param1 name: curry-test001 - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod.yaml b/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod.yaml index e3230787a..7812aebba 100644 --- a/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod.yaml +++ b/samples/tests/unit/sol_refactored/samples/sample2/Files/kubernetes/pod.yaml @@ -5,7 +5,7 @@ metadata: name: vdu2 spec: containers: - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py index 6753bb004..04446d269 100644 --- a/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py +++ b/tacker/tests/functional/sol/vnfpkgm/test_vnf_package.py @@ -40,7 +40,7 @@ class VnfPackageTest(base.BaseTackerTest): # The size of CSAR zip file used while verifying downloaded package. # NOTE: It should be updated if some contents of packages under # `samples/tests/etc/samples` dir. - SIZE_CSAR_ZIP = 16389096 + SIZE_CSAR_ZIP = 16389082 def setUp(self): super(VnfPackageTest, self).setUp() diff --git a/tacker/tests/unit/sol_refactored/mgmt_drivers/test_container_update_mgmt.py b/tacker/tests/unit/sol_refactored/mgmt_drivers/test_container_update_mgmt.py index de8972fac..da7a02c91 100644 --- a/tacker/tests/unit/sol_refactored/mgmt_drivers/test_container_update_mgmt.py +++ b/tacker/tests/unit/sol_refactored/mgmt_drivers/test_container_update_mgmt.py @@ -769,7 +769,7 @@ class TestContainerUpdate(base.TestCase): 'cmKey1.txt', 'cm-data', 'password', 'secret-data'), fakes.fake_replica_set('vdu2-update', 'nginx', - 'celebdor/kuryr-demo', 'cmKey1.txt', + 'nginx', 'cmKey1.txt', 'cm-data', 'password', 'secret-data') ] mock_read_pod.side_effect = [ diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/fakes.py b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/fakes.py index 52e7b4962..df3348956 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/fakes.py +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/fakes.py @@ -78,7 +78,7 @@ def fake_k8s_obj(): ) ) ], - image='celebdor/kuryr-demo', + image='nginx', image_pull_policy='IfNotPresent', name='web-server', ports=[ diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/deployment.yaml b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/deployment.yaml index 8d9c36dac..fee9448ad 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/deployment.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/deployment.yaml @@ -29,9 +29,9 @@ spec: path: / failureThreshold: 5 periodSeconds: 5 - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent - name: kuryr-demo-readiness-probe + name: nginx-readiness-probe ports: - containerPort: 8080 protocol: TCP diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/job.yaml b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/job.yaml index 5a364a589..62f84f192 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/job.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/job.yaml @@ -18,7 +18,7 @@ spec: - command: ["sh", "-c"] args: - echo CURRY - image: celebdor/kuryr-demo + image: nginx name: curryjob resources: limits: {} diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod-template.yaml b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod-template.yaml index bdb785fa6..6449c60ad 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod-template.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod-template.yaml @@ -21,7 +21,7 @@ template: configMapKeyRef: key: param1 name: curry-test001 - image: celebdor/kuryr-demo + image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod.yaml b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod.yaml index ccd51bd93..62deb9eec 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/kubernetes/kubernetes_api_resource/pod.yaml @@ -11,7 +11,7 @@ metadata: uid: d9607e19-f88f-11e6-a518-42010a800195 spec: containers: - - image: celebdor/kuryr-demo + - image: nginx imagePullPolicy: IfNotPresent name: web-server ports: diff --git a/tacker/tests/unit/vnfm/mgmt_drivers/fakes.py b/tacker/tests/unit/vnfm/mgmt_drivers/fakes.py index 0f1f38fae..e71aa1fd0 100644 --- a/tacker/tests/unit/vnfm/mgmt_drivers/fakes.py +++ b/tacker/tests/unit/vnfm/mgmt_drivers/fakes.py @@ -247,7 +247,7 @@ def fake_replicaset_container_config_changed(): ) ) ], - image='celebdor/kuryr-demo', + image='nginx', image_pull_policy='IfNotPresent', name='nginx', ports=[ @@ -301,7 +301,7 @@ def fake_replicaset_volume_config_changed(): spec=client.V1PodSpec( containers=[ client.V1Container( - image='celebdor/kuryr-demo', + image='nginx', image_pull_policy='IfNotPresent', name='nginx', ports=[ @@ -372,7 +372,7 @@ def fake_replicaset_image_changed(): spec=client.V1PodSpec( containers=[ client.V1Container( - image='celebdor/kuryr-demo-old', + image='nginx-old', image_pull_policy='IfNotPresent', name='nginx', ports=[