Skip to content

Commit 3300747

Browse files
DaanHooglandDaanHoogland
authored
Merge branch 'main' into healthcheck-main
2 parents 886a104 + ac3b180 commit 3300747

File tree

18 files changed

+153
-32
lines changed

18 files changed

+153
-32
lines changed

‎.github/workflows/linter.yml‎ renamed to ‎.github/workflows/pre-commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444
path: ~/.cache/pre-commit
4545
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
4646
- name: Run pre-commit
47-
run: pre-commit run --all-files
47+
run: pre-commit run --color=always --all-files
4848
- name: Run manual pre-commit hooks
49-
run: pre-commit run --all-files --hook-stage manual
49+
run: pre-commit run --color=always --all-files --hook-stage manual

‎.pre-commit-config.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ repos:
2525
hooks:
2626
- id: identity
2727
- id: check-hooks-apply
28+
- repo: https://github.com/thlorenz/doctoc.git
29+
rev: v2.2.0
30+
hooks:
31+
- id: doctoc
32+
name: Add TOC for Markdown files
33+
files: ^CONTRIBUTING\.md$|^INSTALL\.md$|^README\.md$
2834
- repo: https://github.com/oxipng/oxipng
2935
rev: v9.1.5
3036
hooks:
@@ -41,6 +47,11 @@ repos:
4147
- repo: https://github.com/Lucas-C/pre-commit-hooks
4248
rev: v1.5.5
4349
hooks:
50+
- id: chmod
51+
name: set file permissions
52+
args: ['644']
53+
files: \.md$
54+
stages: [manual]
4455
- id: insert-license
4556
name: add license for all Markdown files
4657
files: \.md$
@@ -117,14 +128,6 @@ repos:
117128
args: [--config=.github/linters/.markdown-lint.yml]
118129
types: [markdown]
119130
files: \.(md|mdown|markdown)$
120-
- repo: https://github.com/Lucas-C/pre-commit-hooks
121-
rev: v1.5.5
122-
hooks:
123-
- id: chmod
124-
name: set file permissions
125-
args: ['644']
126-
files: \.md$
127-
stages: [manual]
128131
- repo: https://github.com/adrienverge/yamllint
129132
rev: v1.37.1
130133
hooks:

‎CONTRIBUTING.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,24 @@
2121

2222
## Summary
2323

24+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
25+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
26+
27+
- [Summary](#summary)
28+
- [Bug fixes](#bug-fixes)
29+
- [Developing new features](#developing-new-features)
30+
- [PendingReleaseNotes file](#pendingreleasenotes-file)
31+
- [Fork the code](#fork-the-code)
32+
- [Making changes](#making-changes)
33+
- [Rebase `feature_x` to include updates from `upstream/main`](#rebase-feature_x-to-include-updates-from-upstreammain)
34+
- [Make a GitHub Pull Request to contribute your changes](#make-a-github-pull-request-to-contribute-your-changes)
35+
- [Cleaning up after a successful pull request](#cleaning-up-after-a-successful-pull-request)
36+
- [Release Principles](#release-principles)
37+
38+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
39+
40+
## Summary
41+
2442
This document covers how to contribute to the ACS project. ACS uses GitHub PRs to manage code contributions.
2543
These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project, and you will submit a Pull Request for your changes to be added.
2644

‎INSTALL.md‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,21 @@ or the developer [wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/H
2626
Apache CloudStack developers use various platforms for development, this guide
2727
was tested against a CentOS 7 x86_64 setup.
2828

29-
* [Setting up development environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment) for Apache CloudStack.
30-
* [Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack) Apache CloudStack.
31-
* [Appliance based development](https://github.com/rhtyd/monkeybox)
29+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
30+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
31+
32+
- [Setting up Development Environment](#setting-up-development-environment)
33+
- [Using jenv and/or pyenv for Version Management](#using-jenv-andor-pyenv-for-version-management)
34+
- [Getting the Source Code](#getting-the-source-code)
35+
- [Building](#building)
36+
- [To bring up CloudStack UI](#to-bring-up-cloudstack-ui)
37+
- [Building with non-redistributable plugins](#building-with-non-redistributable-plugins)
38+
- [Packaging and Installation](#packaging-and-installation)
39+
- [Debian/Ubuntu](#debianubuntu)
40+
- [RHEL/CentOS](#rhelcentos)
41+
- [Notes](#notes)
42+
43+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
3244

3345
## Setting up Development Environment
3446

‎README.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,25 @@
3131

3232
[![Apache CloudStack](tools/logo/apache_cloudstack.png)](https://cloudstack.apache.org/)
3333

34-
Apache CloudStack is open-source software designed to deploy and manage large
34+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
35+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
36+
37+
- [Who Uses CloudStack?](#who-uses-cloudstack)
38+
- [Demo](#demo)
39+
- [Getting Started](#getting-started)
40+
- [Getting Source Repository](#getting-source-repository)
41+
- [Documentation](#documentation)
42+
- [News and Events](#news-and-events)
43+
- [Getting Involved and Contributing](#getting-involved-and-contributing)
44+
- [Reporting Security Vulnerabilities](#reporting-security-vulnerabilities)
45+
- [License](#license)
46+
- [Notice of Cryptographic Software](#notice-of-cryptographic-software)
47+
- [Star History](#star-history)
48+
- [Contributors](#contributors)
49+
50+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
51+
52+
Apache CloudStack is open source software designed to deploy and manage large
3553
networks of virtual machines, as a highly available, highly scalable
3654
Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used
3755
by a number of service providers to offer public cloud services, and by many

‎engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@
3333

3434
import javax.inject.Inject;
3535

36-
import com.cloud.utils.FileUtil;
3736
import org.apache.cloudstack.utils.CloudStackVersion;
3837
import org.apache.commons.lang3.StringUtils;
39-
import org.apache.logging.log4j.Logger;
4038
import org.apache.logging.log4j.LogManager;
39+
import org.apache.logging.log4j.Logger;
4140

4241
import com.cloud.upgrade.dao.DbUpgrade;
4342
import com.cloud.upgrade.dao.DbUpgradeSystemVmTemplate;
@@ -90,9 +89,10 @@
9089
import com.cloud.upgrade.dao.Upgrade41910to42000;
9190
import com.cloud.upgrade.dao.Upgrade42000to42010;
9291
import com.cloud.upgrade.dao.Upgrade42010to42100;
93-
import com.cloud.upgrade.dao.Upgrade42100to42200;
9492
import com.cloud.upgrade.dao.Upgrade420to421;
93+
import com.cloud.upgrade.dao.Upgrade42100to42200;
9594
import com.cloud.upgrade.dao.Upgrade421to430;
95+
import com.cloud.upgrade.dao.Upgrade42200to42300;
9696
import com.cloud.upgrade.dao.Upgrade430to440;
9797
import com.cloud.upgrade.dao.Upgrade431to440;
9898
import com.cloud.upgrade.dao.Upgrade432to440;
@@ -121,6 +121,7 @@
121121
import com.cloud.upgrade.dao.VersionDaoImpl;
122122
import com.cloud.upgrade.dao.VersionVO;
123123
import com.cloud.upgrade.dao.VersionVO.Step;
124+
import com.cloud.utils.FileUtil;
124125
import com.cloud.utils.component.SystemIntegrityChecker;
125126
import com.cloud.utils.crypt.DBEncryptionUtil;
126127
import com.cloud.utils.db.GlobalLock;
@@ -236,6 +237,7 @@ public DatabaseUpgradeChecker() {
236237
.next("4.20.0.0", new Upgrade42000to42010())
237238
.next("4.20.1.0", new Upgrade42010to42100())
238239
.next("4.21.0.0", new Upgrade42100to42200())
240+
.next("4.22.0.0", new Upgrade42200to42300())
239241
.build();
240242
}
241243

‎engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42200to42300.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.upgrade.dao;
18+
19+
public class Upgrade42200to42300 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
20+
21+
@Override
22+
public String[] getUpgradableVersionRange() {
23+
return new String[]{"4.22.0.0", "4.23.0.0"};
24+
}
25+
26+
@Override
27+
public String getUpgradedVersion() {
28+
return "4.23.0.0";
29+
}
30+
}

‎engine/schema/src/main/resources/META-INF/db/schema-42200to42300-cleanup.sql‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade cleanup from 4.22.0.0 to 4.23.0.0
20+
--;

‎engine/schema/src/main/resources/META-INF/db/schema-42200to42300.sql‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade from 4.22.0.0 to 4.23.0.0
20+
--;

‎ui/public/locales/de_DE.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2078,7 +2078,7 @@
20782078
"message.success.create.internallb": "Interne LB erfolgreich erstellt",
20792079
"message.success.create.isolated.network": "Isoliertes Netzwerk erfolgreich erstellt",
20802080
"message.success.create.keypair": "SSH-Schlüsselpaar erfolgreich erstellt",
2081-
"message.success.create.kubernetes.cluter": "Kubernetes Cluster erfolgreich erstellt",
2081+
"message.success.create.kubernetes.cluster": "Kubernetes Cluster erfolgreich erstellt",
20822082
"message.success.create.l2.network": "L2 Netzwerk erfolgreich erstellt",
20832083
"message.success.create.volume": "Speicher erfolgreich erstellt",
20842084
"message.success.delete": "Erfolgreich gelöscht",

0 commit comments

Comments
 (0)