From 9aa7e89162b6600d352f858585763236d36b25ee Mon Sep 17 00:00:00 2001 From: Norman Aberin Date: Wed, 30 Aug 2023 13:39:43 -0500 Subject: [PATCH 1/2] Added fix for missing secret --- cloudbank/kubernetes/service-account-secret.yaml | 8 ++++++++ cloudbank/scripts/init-cluster.sh | 6 +++++- cloudbank/terraform/containerengine.tf | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 cloudbank/kubernetes/service-account-secret.yaml diff --git a/cloudbank/kubernetes/service-account-secret.yaml b/cloudbank/kubernetes/service-account-secret.yaml new file mode 100644 index 0000000..d3a6436 --- /dev/null +++ b/cloudbank/kubernetes/service-account-secret.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + name: kube-cicd + namespace: kube-system + annotations: + kubernetes.io/service-account.name: kube-cicd +type: kubernetes.io/service-account-token \ No newline at end of file diff --git a/cloudbank/scripts/init-cluster.sh b/cloudbank/scripts/init-cluster.sh index ca266b7..9081239 100755 --- a/cloudbank/scripts/init-cluster.sh +++ b/cloudbank/scripts/init-cluster.sh @@ -11,8 +11,12 @@ kubectl apply -f $CB_KUBERNETES_TEMPLATES_DIR/namespace.yaml kubectl config set-context --current --namespace=$NS kubectl config view --minify | grep namespace: -# Apply service account +# Apply service account and secret kubectl apply -f $CB_KUBERNETES_TEMPLATES_DIR/service-account.yaml +kubectl apply -f $CB_KUBERNETES_TEMPLATES_DIR/service-account-secret.yaml + +# Create secret + # Create Load Balancer Certification $CB_STATE_DIR/gen-lb-cert.sh diff --git a/cloudbank/terraform/containerengine.tf b/cloudbank/terraform/containerengine.tf index c00ad15..99ac569 100644 --- a/cloudbank/terraform/containerengine.tf +++ b/cloudbank/terraform/containerengine.tf @@ -69,4 +69,5 @@ data "oci_containerengine_cluster_option" options { locals { versions = reverse(sort(data.oci_containerengine_cluster_option.options.kubernetes_versions)) latest = local.versions[0] - } \ No newline at end of file + } + From 86f6e661336b9dc7f1d64b007468093a732b00b3 Mon Sep 17 00:00:00 2001 From: Norman Aberin Date: Thu, 31 Aug 2023 18:06:35 -0500 Subject: [PATCH 2/2] Updated Dockerfile fix --- cloudbank/terraform/jenkins-module/scripts/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloudbank/terraform/jenkins-module/scripts/Dockerfile b/cloudbank/terraform/jenkins-module/scripts/Dockerfile index ceb7e35..23d4df7 100644 --- a/cloudbank/terraform/jenkins-module/scripts/Dockerfile +++ b/cloudbank/terraform/jenkins-module/scripts/Dockerfile @@ -4,7 +4,7 @@ FROM jenkins/jenkins:lts-jdk11 USER root # install sudo and curl and setup apt for https sources as well as kubernetes dependencies -RUN apt-get update && apt-get install -qq -y sudo apt-transport-https ca-certificates curl +RUN apt-get update && apt-get install -qq -y sudo ca-certificates curl #install docker @@ -14,8 +14,8 @@ RUN apt-get update && apt-get install -qq -y docker.io RUN apt-get update && apt-get install -qq -y git # setup repository for kubectl install -RUN curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg && \ -echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list +RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \ +echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list # install kubectl RUN sudo apt-get update && sudo apt-get install -y kubectl @@ -23,4 +23,4 @@ RUN sudo apt-get update && sudo apt-get install -y kubectl # install plugins RUN jenkins-plugin-cli --plugins blueocean docker-workflow matrix-auth git workflow-aggregator credentials-binding configuration-as-code kubernetes-cli generic-webhook-trigger multibranch-scan-webhook-trigger -USER jenkins \ No newline at end of file +USER jenkins