Skip to content

Commit

Permalink
Merge pull request #260 from openinfradev/release
Browse files Browse the repository at this point in the history
main merge (20230816)
  • Loading branch information
seungkyua authored Aug 16, 2023
2 parents f4e3da4 + 6a16c8c commit 9efb733
Show file tree
Hide file tree
Showing 13 changed files with 156 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_chart_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# set -e
set -ex

VALIDATE_TARGET_REPO='https://harbor-cicd.taco-cat.xyz/chartrepo/tks'
VALIDATE_TARGET_REPO='https://harbor.taco-cat.xyz/chartrepo/tks'
#'https://openinfradev.github.io'
EXCEPTION_LIST=
#'https://argoproj.github.io/argo-helm,https://bitnami-labs.github.io/sealed-secrets,https://charts.appscode.com/stable,https://charts.appscode.com/stable/,https://charts.bitnami.com/bitnami,https://codecentric.github.io/helm-charts,https://grafana.github.io/helm-charts,https://helm-charts.wikimedia.org/stable/,https://helm.elastic.co,https://kiali.org/helm-charts,https://kubernetes-sigs.github.io/metrics-server/,https://kubernetes.github.io/ingress-nginx,https://prometheus-community.github.io/helm-charts'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_image_repo.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex

VALIDATE_TARGET_REPO='https://harbor-cicd.taco-cat.xyz/tks'
VALIDATE_TARGET_REPO='https://harbor.taco-cat.xyz/tks'
EXCEPTION_LIST=
#'appscode/kubed:v0.12.0,appscode/kubed:v0.12.0-rc.3,busybox:1.31,busybox:1.31.1,calico/cni:v3.15.5,calico/kube-controllers:v3.15.5,calico/node:v3.15.5,calico/pod2daemon-flexvol:v3.15.5,directxman12/k8s-prometheus-adapter-amd64:v0.7.0,docker.elastic.co/eck/eck-operator:1.8.0,docker.elastic.co/elasticsearch/elasticsearch:7.5.1,docker.elastic.co/kibana/kibana:7.5.1,docker.io/bitnami/kube-state-metrics:1.9.7-debian-10-r143,docker.io/bitnami/minio:2021.6.14-debian-10-r0,docker.io/bitnami/postgresql:11.7.0-debian-10-r98,docker.io/bitnami/postgresql:15.1.0-debian-11-r0,docker.io/bitnami/thanos:0.17.2-scratch-r1,docker.io/grafana/loki:2.6.1,docker.io/grafana/promtail:2.4.1,docker.io/jboss/keycloak:10.0.0,docker.io/ncabatoff/process-exporter:0.2.11,docker.io/nginxinc/nginx-unprivileged:1.19-alpine,docker:19.03,ghcr.io/openinfradev/fluentbit:25bc31cd4333f7f77435561ec70bc68e0c73a194,ghcr.io/resmoio/kubernetes-event-exporter:v1.0,grafana/grafana:8.3.3,istio/pilot:1.13.1,istio/proxyv2:1.13.1,jaegertracing/jaeger-operator:1.29.1,k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2,k8s.gcr.io/hyperkube:v1.18.8,k8s.gcr.io/ingress-nginx/controller:v1.1.1@sha256:0bc88eb15f9e7f84e8e56c14fa5735aaa488b840983f87bd79b1054190e660de,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068,k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660,k8s.gcr.io/metrics-server/metrics-server:v0.6.1,kubesphere/fluent-operator:v1.5.0,prom/pushgateway:v1.3.0,quay.io/airshipit/kubernetes-entrypoint:v1.0.0,quay.io/argoproj/argocli:v3.2.6,quay.io/argoproj/workflow-controller:v3.2.6,quay.io/bitnami/sealed-secrets-controller:v0.16.0,quay.io/keycloak/keycloak-operator:17.0.0,quay.io/kiali/kiali-operator:v1.45.1,quay.io/kiwigrid/k8s-sidecar:1.14.2,quay.io/prometheus-operator/prometheus-operator:v0.52.0,quay.io/prometheus/alertmanager:v0.23.0,quay.io/prometheus/node-exporter:v1.0.1,quay.io/prometheus/prometheus:v2.31.1,rancher/local-path-provisioner:v0.0.22,siim/logalert-exporter:v0.1.1,sktdev/cloud-console:v1.0.4,sktdev/os-eventrouter:69a58b'
if [ $EXCEPTION_LIST ]; then
Expand Down
16 changes: 8 additions & 8 deletions decapod-controller/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: prepare-decapod-controller
version: 0.1.0
releaseName: db-secret-argo
Expand All @@ -31,7 +31,7 @@ spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: prepare-decapod-controller
version: 0.1.0
releaseName: db-secret-decapod-db
Expand All @@ -53,7 +53,7 @@ spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: postgresql
version: 12.1.2
releaseName: postgresql
Expand Down Expand Up @@ -85,7 +85,7 @@ spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: argo-workflows
version: 0.2.6
releaseName: argo-workflows-operator-crds
Expand All @@ -102,7 +102,7 @@ spec:
helmVersion: v3
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: argo-workflows
version: 0.2.6
releaseName: argo-workflows-operator
Expand All @@ -111,15 +111,15 @@ spec:
server:
serviceType: NodePort
image:
registry: harbor-cicd.taco-cat.xyz
registry: harbor.taco-cat.xyz
repository: tks/argocli
tag: v3.2.6
extraArgs:
- "--auth-mode=server"
controller:
containerRuntimeExecutor: k8sapi
image:
registry: harbor-cicd.taco-cat.xyz
registry: harbor.taco-cat.xyz
repository: tks/workflow-controller
tag: v3.2.6
persistence:
Expand All @@ -140,7 +140,7 @@ spec:
key: postgresql-password
executor:
image:
registry: harbor-cicd.taco-cat.xyz
registry: harbor.taco-cat.xyz
repository: tks/argoexec
tag: v3.2.6
wait: true
6 changes: 3 additions & 3 deletions deprecated_admin-tools/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: keycloak-operator
version: 0.1.0
origin: https://openinfradev.github.io/helm-repo
Expand All @@ -26,7 +26,7 @@ metadata:
spec:
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: keycloak-operator
version: 0.1.0
origin: https://openinfradev.github.io/helm-repo
Expand All @@ -43,7 +43,7 @@ metadata:
spec:
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: keycloak-resources
version: 0.1.0
origin: https://openinfradev.github.io/helm-repo
Expand Down
4 changes: 2 additions & 2 deletions deprecated_cloud-console/base/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: keycloak
version: 8.2.2
origin: https://codecentric.github.io/helm-charts
Expand Down Expand Up @@ -58,7 +58,7 @@ metadata:
spec:
chart:
type: helmrepo
repository: https://harbor-cicd.taco-cat.xyz/chartrepo/tks
repository: https://harbor.taco-cat.xyz/chartrepo/tks
name: cloud-console
version: 1.0.0
origin: https://openinfradev.github.io/helm-repo
Expand Down
Loading

0 comments on commit 9efb733

Please sign in to comment.