From 1917e9cffdeee80dd353d1ee175909b2d38e07ab Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Mon, 16 Jan 2023 16:44:39 +0200 Subject: [PATCH] Change controller-manager-secret to controller-manager to use default. --- scripts/arc/values.yml | 4 ++-- scripts/deploy-gh-runners.sh | 14 +++++++------- scripts/k8s/runners-stream-ci-auto-template.yaml | 4 ++-- scripts/k8s/runners-stream-ci-auto.yaml | 4 ++-- scripts/k8s/runners-stream-ci-large-template.yaml | 4 ++-- scripts/k8s/runners-stream-ci-large.yaml | 4 ++-- scripts/k8s/runners-stream-ci-manual-template.yaml | 2 +- scripts/k8s/runners-stream-ci-manual.yaml | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scripts/arc/values.yml b/scripts/arc/values.yml index 4a0615be..3def3b27 100644 --- a/scripts/arc/values.yml +++ b/scripts/arc/values.yml @@ -1,14 +1,14 @@ syncPeriod: 2m authSecret: create: false - name: controller-manager-secret + name: controller-manager priorityClassName: high-priority imagePullSecrets: - name: scdf-metadata-default githubWebhookServer: priorityClassName: high-priority secret: - name: controller-manager-secret + name: controller-manager enabled: true image: tag: v0.26.0 diff --git a/scripts/deploy-gh-runners.sh b/scripts/deploy-gh-runners.sh index a60b1cd1..5fdbc973 100755 --- a/scripts/deploy-gh-runners.sh +++ b/scripts/deploy-gh-runners.sh @@ -44,26 +44,26 @@ export SVC=controller-manager $SCDIR/ensure-ns.sh $NS kubectl apply -f $SCDIR/k8s/pod-priorities.yaml kubectl apply -f $SCDIR/k8s/pod-priorities.yaml --namespace $NS -echo "Create secret controller-manager-secret in $NS" -$SCDIR/delete-secret.sh controller-manager-secret -$SCDIR/delete-secret.sh controller-manager-secret $NS +echo "Create secret controller-manager in $NS" +$SCDIR/delete-secret.sh controller-manager +$SCDIR/delete-secret.sh controller-manager $NS if [ "$GH_ARC_PAT" != "" ]; then echo "Using GH_ARC_PAT as github_token" - kubectl create secret generic controller-manager-secret \ + kubectl create secret generic controller-manager \ --namespace $NS \ --from-literal=github_token="$GH_ARC_PAT" - kubectl create secret generic controller-manager-secret \ + kubectl create secret generic controller-manager \ --from-literal=github_token="$GH_ARC_PAT" else echo "Using GitHub App $GH_ARC_APP_ID / $GH_ARC_INSTALLATION_ID" - kubectl create secret generic controller-manager-secret \ + kubectl create secret generic controller-manager \ --namespace $NS \ --from-literal=github_app_id="${GH_ARC_APP_ID}" \ --from-literal=github_app_installation_id="${GH_ARC_INSTALLATION_ID}" \ --from-literal=github_app_private_key="${GH_ARC_PRIVATE_KEY}" - kubectl create secret generic controller-manager-secret \ + kubectl create secret generic controller-manager \ --from-literal=github_app_id="${GH_ARC_APP_ID}" \ --from-literal=github_app_installation_id="${GH_ARC_INSTALLATION_ID}" \ --from-literal=github_app_private_key="${GH_ARC_PRIVATE_KEY}" diff --git a/scripts/k8s/runners-stream-ci-auto-template.yaml b/scripts/k8s/runners-stream-ci-auto-template.yaml index 3992bbad..3781c0b8 100644 --- a/scripts/k8s/runners-stream-ci-auto-template.yaml +++ b/scripts/k8s/runners-stream-ci-auto-template.yaml @@ -14,7 +14,7 @@ spec: repository: spring-cloud/stream-applications githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager resources: requests: cpu: "1500m" @@ -29,7 +29,7 @@ metadata: spec: githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager minReplicas: min-replicas-placeholder maxReplicas: max-replicas-placeholder scaleTargetRef: diff --git a/scripts/k8s/runners-stream-ci-auto.yaml b/scripts/k8s/runners-stream-ci-auto.yaml index 7825a2fe..6659dabd 100644 --- a/scripts/k8s/runners-stream-ci-auto.yaml +++ b/scripts/k8s/runners-stream-ci-auto.yaml @@ -14,7 +14,7 @@ spec: repository: spring-cloud/stream-applications githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager resources: requests: cpu: "1500m" @@ -29,7 +29,7 @@ metadata: spec: githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager minReplicas: 2 maxReplicas: 2 scaleTargetRef: diff --git a/scripts/k8s/runners-stream-ci-large-template.yaml b/scripts/k8s/runners-stream-ci-large-template.yaml index b4212085..cd7ff5e7 100644 --- a/scripts/k8s/runners-stream-ci-large-template.yaml +++ b/scripts/k8s/runners-stream-ci-large-template.yaml @@ -14,7 +14,7 @@ spec: repository: spring-cloud/stream-applications githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager resources: requests: cpu: "3000m" @@ -29,7 +29,7 @@ metadata: spec: githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager minReplicas: 0 maxReplicas: 2 scaleTargetRef: diff --git a/scripts/k8s/runners-stream-ci-large.yaml b/scripts/k8s/runners-stream-ci-large.yaml index b4212085..cd7ff5e7 100644 --- a/scripts/k8s/runners-stream-ci-large.yaml +++ b/scripts/k8s/runners-stream-ci-large.yaml @@ -14,7 +14,7 @@ spec: repository: spring-cloud/stream-applications githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager resources: requests: cpu: "3000m" @@ -29,7 +29,7 @@ metadata: spec: githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager minReplicas: 0 maxReplicas: 2 scaleTargetRef: diff --git a/scripts/k8s/runners-stream-ci-manual-template.yaml b/scripts/k8s/runners-stream-ci-manual-template.yaml index aae7b6c3..b0fb2862 100644 --- a/scripts/k8s/runners-stream-ci-manual-template.yaml +++ b/scripts/k8s/runners-stream-ci-manual-template.yaml @@ -15,7 +15,7 @@ spec: repository: spring-cloud/stream-applications githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager resources: requests: cpu: "1500m" diff --git a/scripts/k8s/runners-stream-ci-manual.yaml b/scripts/k8s/runners-stream-ci-manual.yaml index 8bb0d4d8..394af303 100644 --- a/scripts/k8s/runners-stream-ci-manual.yaml +++ b/scripts/k8s/runners-stream-ci-manual.yaml @@ -15,7 +15,7 @@ spec: repository: spring-cloud/stream-applications githubAPICredentialsFrom: secretRef: - name: controller-manager-secret + name: controller-manager resources: requests: cpu: "1500m"