You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2020/05/28 16:32:05 UTC
[GitHub] [cloudstack] shwstppr opened a new pull request #4116: cks: fix k8s cluster template retrieval
shwstppr opened a new pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116
## Description
Fixes #4107
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
## Screenshots (if appropriate):
## How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document -->
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r443030410
##########
File path: plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##########
@@ -300,8 +294,7 @@ private boolean isKubernetesServiceTemplateConfigured(DataCenter zone) {
LOGGER.warn(String.format("Unable to find the template %s to be used for provisioning Kubernetes cluster nodes", templateName));
return false;
}
- List<VMTemplateZoneVO> listZoneTemplate = templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
- if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+ if (CollectionUtils.isEmpty(templateJoinDao.newTemplateView(template, zone.getId(), true))) {
Review comment:
The call `public List<TemplateJoinVO> newTemplateView(VirtualMachineTemplate template, long zoneId, boolean readyOnly)` as implemented in `TemplateJoinDaoImpl`, does a search including removed leading to a hit for a template that is not available. Is this intended?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635942168
@shwstppr a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr removed a comment on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr removed a comment on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635941974
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-653731597
Packaging result: ✔centos7 ✖debian. JID-1524
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649616890
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649027768
Packaging result: ✔centos7 ✔debian. JID-1454
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-643530462
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-655806907
@shwstppr a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-642536856
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r436426787
##########
File path: plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##########
@@ -908,6 +910,10 @@ private void validateKubernetesClusterUpgradeParameters(UpgradeKubernetesCluster
if (!KubernetesCluster.State.Running.equals(kubernetesCluster.getState())) {
throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s is not in running state", kubernetesCluster.getUuid()));
}
+ final DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ if (zone == null) {
+ logAndThrow(Level.WARN, String.format("Unable to find zone for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
Review comment:
Is `logAndThrow` a new utility?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635457348
@shwstppr a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-655639188
<b>Trillian test result (tid-2028)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 37747 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4116-t2028-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Smoke tests completed. 82 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_add_delete_kubernetes_supported_version | `Error` | 5.23 | test_kubernetes_supported_versions.py
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649014429
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-657613394
<b>Trillian test result (tid-2090)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35181 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4116-t2090-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Smoke tests completed. 83 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-653724620
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649617540
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-655806567
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-640377070
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-657355963
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-657356190
@shwstppr a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-651690486
Can you help review and test @davidjumani
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649047077
@shwstppr a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd merged pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd merged pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635457032
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649014909
@shwstppr a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-642566805
Packaging result: ✔centos7 ✔debian. JID-1341
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-654658771
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-642536124
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649046475
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649325679
<b>Trillian test result (tid-1842)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39544 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4116-t1842-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
Smoke tests completed. 81 look OK, 2 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_04_deploy_and_upgrade_kubernetes_cluster | `Failure` | 606.23 | test_kubernetes_clusters.py
test_01_add_delete_kubernetes_supported_version | `Error` | 5.29 | test_kubernetes_supported_versions.py
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-655304432
@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r462494564
##########
File path: plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##########
@@ -300,8 +294,7 @@ private boolean isKubernetesServiceTemplateConfigured(DataCenter zone) {
LOGGER.warn(String.format("Unable to find the template %s to be used for provisioning Kubernetes cluster nodes", templateName));
return false;
}
- List<VMTemplateZoneVO> listZoneTemplate = templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
- if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+ if (CollectionUtils.isEmpty(templateJoinDao.newTemplateView(template, zone.getId(), true))) {
Review comment:
any resolution on this @shwstppr ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-649639548
Packaging result: ✔centos7 ✔debian. JID-1463
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-643530597
@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-640386774
@shwstppr a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr closed pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr closed pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
rhtyd commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r436426689
##########
File path: engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java
##########
@@ -36,6 +36,8 @@
public VMTemplateVO findByTemplateName(String templateName);
+ public VMTemplateVO findValidByTemplateName(String templateName);
+
// public void update(VMTemplateVO template);
Review comment:
Remove unused/commented method
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr removed a comment on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr removed a comment on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635457032
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-640385599
Packaging result: ✔centos7 ✔debian. JID-1311
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr closed pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr closed pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-654658480
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-640386380
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r436463068
##########
File path: engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDao.java
##########
@@ -36,6 +36,8 @@
public VMTemplateVO findByTemplateName(String templateName);
+ public VMTemplateVO findValidByTemplateName(String templateName);
+
// public void update(VMTemplateVO template);
Review comment:
done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-656023178
<b>Trillian test result (tid-2039)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35106 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4116-t2039-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
Smoke tests completed. 82 look OK, 1 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
test_01_add_delete_kubernetes_supported_version | `Error` | 1807.31 | test_kubernetes_supported_versions.py
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-636225604
<b>Trillian test result (tid-1590)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35638 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4116-t1590-kvm-centos7.zip
Smoke tests completed. 83 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r445115883
##########
File path: plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##########
@@ -300,8 +294,7 @@ private boolean isKubernetesServiceTemplateConfigured(DataCenter zone) {
LOGGER.warn(String.format("Unable to find the template %s to be used for provisioning Kubernetes cluster nodes", templateName));
return false;
}
- List<VMTemplateZoneVO> listZoneTemplate = templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
- if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+ if (CollectionUtils.isEmpty(templateJoinDao.newTemplateView(template, zone.getId(), true))) {
Review comment:
@DaanHoogland thanks for pointing it. I'll check that again
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635471596
Packaging result: ✔centos7 ✔debian. JID-1255
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-655304019
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-635941974
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-653724536
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-654693366
Packaging result: ✔centos7 ✔debian. JID-1543
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd closed pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
rhtyd closed pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-640377469
@shwstppr a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
shwstppr commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r436462951
##########
File path: plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##########
@@ -908,6 +910,10 @@ private void validateKubernetesClusterUpgradeParameters(UpgradeKubernetesCluster
if (!KubernetesCluster.State.Running.equals(kubernetesCluster.getState())) {
throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s is not in running state", kubernetesCluster.getUuid()));
}
+ final DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ if (zone == null) {
+ logAndThrow(Level.WARN, String.format("Unable to find zone for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
Review comment:
Just some helper methods to log and throw exceptions for similar error https://github.com/apache/cloudstack/blob/8c6861bdc0f6b9fbf58a1c099f36ba08348dd204/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java#L216-L249
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
shwstppr commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r462797409
##########
File path: plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##########
@@ -300,8 +294,7 @@ private boolean isKubernetesServiceTemplateConfigured(DataCenter zone) {
LOGGER.warn(String.format("Unable to find the template %s to be used for provisioning Kubernetes cluster nodes", templateName));
return false;
}
- List<VMTemplateZoneVO> listZoneTemplate = templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
- if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+ if (CollectionUtils.isEmpty(templateJoinDao.newTemplateView(template, zone.getId(), true))) {
Review comment:
@DaanHoogland I've checked this. `newTemplateView` is called here with `readyOnly=true` and deleted templates have `state=NULL`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4116: cks: fix template, deployment issues
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-655804069
Packaging result: ✔centos7 ✔debian. JID-1562
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4116: cks: fix k8s cluster template retrieval
Posted by GitBox <gi...@apache.org>.
rhtyd commented on pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#issuecomment-648556704
@shwstppr can you club your cks PRs, and at least change base branch to 4.14?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org