Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20240115 main to develop #343

Merged
merged 11 commits into from
Jan 15, 2024
Merged

20240115 main to develop #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
75386c2
bugfix. fix typo error
TKS-BOT Nov 20, 2023
56958fe
Merge pull request #335 from openinfradev/fix_syntax_error
ktkfree Nov 20, 2023
fe88d3e
Merge pull request #336 from openinfradev/release
ktkfree Nov 20, 2023
fec970d
render: handle yaml ConstructorError during rendering
Nov 24, 2023
34816e6
fix etcd metrics port for aws security rule
zugwan Nov 24, 2023
552b743
Merge pull request #337 from openinfradev/render
ktkfree Nov 24, 2023
b655cf6
Merge pull request #339 from openinfradev/etcd_metric
ktkfree Nov 27, 2023
f9d86f3
Merge pull request #340 from openinfradev/release
ktkfree Nov 27, 2023
ec6b2c6
bug fix: missing realms in url
cho4036 Nov 27, 2023
2b6a76e
Merge pull request #341 from cho4036/release
ktkfree Nov 27, 2023
b546034
Merge pull request #342 from openinfradev/release
ktkfree Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy_apps/tks-primary-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ spec:
parameters:
- name: cluster_id
value: "{{ workflow.parameters.github_account }}/{{steps.sync-organization-changes.outputs.parameters.changed_primary_id}}"
when: "{{steps.sync-organization-changes.outputs.parameters.changed_primary_id}} != NONE"
when: "'{{steps.sync-organization-changes.outputs.parameters.changed_primary_id}}' != NONE"

#######################
# Template Definition #
Expand Down
2 changes: 1 addition & 1 deletion git-repo/create-cluster-repo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ spec:

yq -i e ".global.clusterEndpointHost=\"$cluster_endpoint_host\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
yq -i e ".global.clusterEndpointPort=$cluster_endpoint_port" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
yq -i e ".global.keycloakIssuerUri=\"$KEYCLOAK_URL\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
yq -i e ".global.keycloakIssuerUri=\"$KEYCLOAK_URL/realms/$CONTRACT_ID\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
yq -i e ".global.keycloakClientId=\"$client_id\"" $CLUSTER_ID/$CLUSTER_ID/tks-cluster/site-values.yaml
;;

Expand Down
2 changes: 1 addition & 1 deletion git-repo/render-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
- name: https_enabled
container:
name: render-manifests-template
image: harbor.taco-cat.xyz/tks/decapod-render:v3.3.0
image: harbor.taco-cat.xyz/tks/decapod-render:v3.3.4
command:
- /bin/bash
- '-exc'
Expand Down
4 changes: 2 additions & 2 deletions tks-cluster/manage-internal-communication.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ spec:
# Create Security Group
SG=$(aws ec2 create-security-group --group-name taco-internal --description "Security group for interanl communication among nodes" --vpc-id $VPC --output text)
# Set ingress rule
# - 2379 for kube-etcd
# - 2381 for kube-etcd metrics
# - 10249 for kube-proxy
aws ec2 authorize-security-group-ingress --group-id $SG --protocol tcp --port 2379 --cidr $CIDR
aws ec2 authorize-security-group-ingress --group-id $SG --protocol tcp --port 2381 --cidr $CIDR
aws ec2 authorize-security-group-ingress --group-id $SG --protocol tcp --port 10249 --cidr $CIDR

# Add Security Group to all node in the VPC
Expand Down
Loading