Skip to content

Commit

Permalink
Merge pull request #328 from Sachin-Mamoru/6.1.0-helm-charts
Browse files Browse the repository at this point in the history
Add is-6.1.0 pattern-1 helm charts
  • Loading branch information
Buddhimah authored Feb 15, 2023
2 parents b619d0f + 228d267 commit e050564
Show file tree
Hide file tree
Showing 15 changed files with 1,094 additions and 744 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Changelog

All notable changes to Kubernetes and Helm resources for WSO2 IAM version `6.0.x` in each resource release, will be documented in this file.
All notable changes to Kubernetes and Helm resources for WSO2 IAM version `6.1.x` in each resource release, will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [v6.0.0.1] - 2022-08-17
## [v6.1.0.1] - 2023-02-01

### Added

- Introduce Kubernetes resources for simplified deployment of WSO2 Identity Server version `6.0.0`.
- Introduce Kubernetes resources for simplified deployment of WSO2 Identity Server version `6.1.0`.

### Changed

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ We encourage you to report any problems in the WSO2 Kubernetes and Helm resource

If you like to contribute with a bug fix or a new feature, start by posting an issue and discussing the best way to implement it.

Unlike most projects, development for this repository is carried out on the 6.0.x branch. This is because the master branch contains the latest stable release of the project. The code in 6.0.x is merged to the master branch after a final review and a round of testing.
Unlike most projects, development for this repository is carried out on the 6.1.x branch. This is because the master branch contains the latest stable release of the project. The code in 6.1.x is merged to the master branch after a final review and a round of testing.

Please follow these guidelines when contributing to the code:

1. Fork the current repository.
2. Create a topic branch from the 6.0.x branch.
2. Create a topic branch from the 6.1.x branch.
3. Make commits in logical units.
4. Before you send out the pull request, sync your forked repository with a remote repository. This makes your pull request simple and clear.

```bash
git clone https://github.com/<user>/kubernetes-is.git
git remote add upstream https://github.com/wso2/kubernetes-is.git
git fetch upstream
git checkout -b <topic-branch> upstream/6.0.x
git checkout -b <topic-branch> upstream/6.1.x

# add some work

Expand Down
2 changes: 1 addition & 1 deletion advanced/databases/mysql-is/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ apiVersion: v1
appVersion: "5.7"
description: A Helm chart for MySQL based deployment of WSO2 Identity And Access Management Datasources
name: mysql-is
version: 6.0.0-1
version: 6.1.0-1
icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
72 changes: 3 additions & 69 deletions advanced/databases/mysql-is/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1691,7 +1691,8 @@ mysql:
('8ec6dbf1-218a-49bf-bc34-0d2db52d151c', 'CORS_CONFIGURATION', 'A resource type to keep the tenant CORS configurations'),
('669b99ca-cdb0-44a6-8cae-babed3b585df', 'Publisher', 'A resource type to keep the event publisher configurations'),
('73f6d9ca-62f4-4566-bab9-2a930ae51ba8', 'BRANDING_PREFERENCES', 'A resource type to keep the tenant branding preferences'),
('899c69b2-8bf7-46b5-9666-f7f99f90d6cc', 'fido-config', 'A resource type to store FIDO authenticator related preferences');
('899c69b2-8bf7-46b5-9666-f7f99f90d6cc', 'fido-config', 'A resource type to store FIDO authenticator related preferences'),
('7f24050f-3e3d-4a00-b10f-fd5450d6523e', 'input-validation-configurations', 'A resource type to store input validation related configurations');
CREATE TABLE IF NOT EXISTS IDN_CONFIG_RESOURCE (
ID VARCHAR(255) NOT NULL,
Expand Down Expand Up @@ -1858,6 +1859,7 @@ mysql:
OWNER_ORG_ID CHAR(36) NOT NULL,
SHARED_APP_ID CHAR(36) NOT NULL,
SHARED_ORG_ID CHAR(36) NOT NULL,
SHARE_WITH_ALL_CHILDREN BOOLEAN DEFAULT FALSE,
PRIMARY KEY (ID),
FOREIGN KEY (MAIN_APP_ID) REFERENCES SP_APP(UUID) ON DELETE CASCADE,
FOREIGN KEY (SHARED_APP_ID) REFERENCES SP_APP(UUID) ON DELETE CASCADE,
Expand Down Expand Up @@ -1951,74 +1953,6 @@ mysql:
-- IDN_CORS_ASSOCIATION --
CREATE INDEX IDX_CORS_ORIGIN_ID ON IDN_CORS_ASSOCIATION (IDN_CORS_ORIGIN_ID);
CREATE TABLE IF NOT EXISTS IDN_UMA_RESOURCE (
ID INTEGER AUTO_INCREMENT NOT NULL,
RESOURCE_ID VARCHAR(255),
RESOURCE_NAME VARCHAR(255),
TIME_CREATED TIMESTAMP NOT NULL,
RESOURCE_OWNER_NAME VARCHAR(255),
CLIENT_ID VARCHAR(255),
TENANT_ID INTEGER DEFAULT -1234,
USER_DOMAIN VARCHAR(50),
PRIMARY KEY (ID)
);
CREATE INDEX IDX_RID ON IDN_UMA_RESOURCE (RESOURCE_ID);
CREATE INDEX IDX_USER ON IDN_UMA_RESOURCE (RESOURCE_OWNER_NAME, USER_DOMAIN);
CREATE INDEX IDX_USER_RID ON IDN_UMA_RESOURCE (RESOURCE_ID, RESOURCE_OWNER_NAME, USER_DOMAIN, CLIENT_ID);
CREATE TABLE IF NOT EXISTS IDN_UMA_RESOURCE_META_DATA (
ID INTEGER AUTO_INCREMENT NOT NULL,
RESOURCE_IDENTITY INTEGER NOT NULL,
PROPERTY_KEY VARCHAR(40),
PROPERTY_VALUE VARCHAR(255),
PRIMARY KEY (ID),
FOREIGN KEY (RESOURCE_IDENTITY) REFERENCES IDN_UMA_RESOURCE (ID) ON DELETE CASCADE
);
CREATE TABLE IF NOT EXISTS IDN_UMA_RESOURCE_SCOPE (
ID INTEGER AUTO_INCREMENT NOT NULL,
RESOURCE_IDENTITY INTEGER NOT NULL,
SCOPE_NAME VARCHAR(255),
PRIMARY KEY (ID),
FOREIGN KEY (RESOURCE_IDENTITY) REFERENCES IDN_UMA_RESOURCE (ID) ON DELETE CASCADE
);
CREATE INDEX IDX_RS ON IDN_UMA_RESOURCE_SCOPE (SCOPE_NAME);
CREATE TABLE IF NOT EXISTS IDN_UMA_PERMISSION_TICKET (
ID INTEGER AUTO_INCREMENT NOT NULL,
PT VARCHAR(255) NOT NULL,
TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
EXPIRY_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
TICKET_STATE VARCHAR(25) DEFAULT 'ACTIVE',
TENANT_ID INTEGER DEFAULT -1234,
TOKEN_ID VARCHAR(255),
PRIMARY KEY (ID)
);
CREATE INDEX IDX_PT ON IDN_UMA_PERMISSION_TICKET (PT);
CREATE TABLE IF NOT EXISTS IDN_UMA_PT_RESOURCE (
ID INTEGER AUTO_INCREMENT NOT NULL,
PT_RESOURCE_ID INTEGER NOT NULL,
PT_ID INTEGER NOT NULL,
PRIMARY KEY (ID),
FOREIGN KEY (PT_ID) REFERENCES IDN_UMA_PERMISSION_TICKET (ID) ON DELETE CASCADE,
FOREIGN KEY (PT_RESOURCE_ID) REFERENCES IDN_UMA_RESOURCE (ID) ON DELETE CASCADE
);
CREATE TABLE IF NOT EXISTS IDN_UMA_PT_RESOURCE_SCOPE (
ID INTEGER AUTO_INCREMENT NOT NULL,
PT_RESOURCE_ID INTEGER NOT NULL,
PT_SCOPE_ID INTEGER NOT NULL,
PRIMARY KEY (ID),
FOREIGN KEY (PT_RESOURCE_ID) REFERENCES IDN_UMA_PT_RESOURCE (ID) ON DELETE CASCADE,
FOREIGN KEY (PT_SCOPE_ID) REFERENCES IDN_UMA_RESOURCE_SCOPE (ID) ON DELETE CASCADE
);
CREATE TABLE CM_PII_CATEGORY (
ID INTEGER AUTO_INCREMENT,
NAME VARCHAR(255) NOT NULL,
Expand Down
4 changes: 2 additions & 2 deletions advanced/is-pattern-1/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.

apiVersion: v1
appVersion: "6.0.0"
appVersion: "6.1.0"
description: A Helm chart for the deployment of WSO2 Identity And Access Management pattern 1
name: is-pattern-1
version: 6.0.0-1
version: 6.1.0-1
icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg
4 changes: 2 additions & 2 deletions advanced/is-pattern-1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository]
**Helm version 2**

```
helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 6.0.0-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 6.1.0-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
```

**Helm version 3**
Expand All @@ -72,7 +72,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository]
- Deploy the Kubernetes resources using the Helm Chart

```
helm install <RELEASE_NAME> wso2/is-pattern-1 --version 6.0.0-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
helm install <RELEASE_NAME> wso2/is-pattern-1 --version 6.1.0-1 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
```

Please provide your WSO2 Subscription Credentials via input values (using `--set` argument).
Expand Down
2 changes: 1 addition & 1 deletion advanced/is-pattern-1/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

dependencies:
- name: mysql-is
version: "6.0.0-1"
version: "6.1.0-1"
repository: "file://../databases/mysql-is"
condition: wso2.deployment.dependencies.mysql.enabled
2 changes: 1 addition & 1 deletion advanced/is-pattern-1/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ wso2:
# If a custom image must be used, provide its value
dockerRegistry: "docker.wso2.com"
imageName: "wso2is"
imageTag: "6.0.0.0"
imageTag: "6.1.0.0"
# Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images)
imagePullPolicy: Always

Expand Down
2 changes: 1 addition & 1 deletion simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@

Your `<NODE-IP>` will be provided at the end of the deployment.

5. Try out WSO2 Identity Server by following **[WSO2 Identity Server - Quick Start Guide](https://is.docs.wso2.com/en/6.0.0/get-started/quick-start-guide/)**.
5. Try out WSO2 Identity Server by following **[WSO2 Identity Server - Quick Start Guide](https://is.docs.wso2.com/en/6.1.0/get-started/quick-start-guide/)**.
2 changes: 1 addition & 1 deletion simple/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ license_text="LICENSE.txt"
EOF

echo 'IMG_DEST="docker.wso2.com"' >> $SCRIPT
echo 'IMG_TAG="6.0.0.0"' >> $SCRIPT
echo 'IMG_TAG="6.1.0.0"' >> $SCRIPT

cat >> $SCRIPT << "EOF"
Expand Down
Loading

0 comments on commit e050564

Please sign in to comment.