resolving conflict

.devcontainer/test-on-create.sh

@@ -1,150 +1,159 @@
-#!/bin/bash
-
-set -u
-set -e
-set -x
-
-KUBERNETES_VERSION=v1.26.1
-GO_VERSION=1.21.7
-OPERATOR_SDK_VERSION=v1.19.x
-CERT_MANAGER_VERSION=v1.12.6 
-
-sudo apt-get update
-sudo apt-get install snap dos2unix 
-
-
-# uninstall existing golang 
-
-sudo rm -rvf /usr/local/go/
-
-# install go GO_VERSION
-
-
-VERSION=${GO_VERSION} # go version
-ARCH="amd64" # go architecture
-curl -O -L "https://golang.org/dl/go${VERSION}.linux-${ARCH}.tar.gz"
-ls -l
-
-#Extract the tarball using the tar command:
-
-sudo tar -xf "go${VERSION}.linux-${ARCH}.tar.gz"
-ls -l
-cd go/
-ls -l
-cd ..
-
-
-#Set up the permissions using the chown command/chmod command:
-sudo chown -R root:root ./go
-
-sudo rm -f -R /usr/local/go
-
-sudo mv -v go /usr/local
-
-rm -f go*.tar.gz
-
-cd ~
-
-
-# Kustomize 
-
-curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
-
-chmod a+x kustomize
-sudo mv kustomize /usr/local/bin/kustomize
-
-
-
-# Kubebuilder 
-
-cd ~
-
-curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/$(go env GOOS)/$(go env GOARCH)
-sudo chmod +x kubebuilder && sudo mv kubebuilder /usr/local/bin/kubebuilder
-
-# Operator SDK
-
-git clone https://github.com/operator-framework/operator-sdk
-cd operator-sdk
-git checkout ${OPERATOR_SDK_VERSION}
-make install
-
-cd ~
-
-rm -fr operator-sdk
-
-# Kubernetes staff 
-
-alias k='kubectl'
-alias kubectx='kubectl config use-context '
-alias kubens='kubectl config set-context --current --namespace '
-
-
-# krew plugins 
-
-(
-  set -x; cd "$(mktemp -d)" &&
-  OS="$(uname | tr '[:upper:]' '[:lower:]')" &&
-  ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" &&
-  KREW="krew-${OS}_${ARCH}" &&
-  curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/${KREW}.tar.gz" &&
-  tar zxvf "${KREW}.tar.gz" &&
-  ./"${KREW}" install krew
-)
-
-#Add the $HOME/.krew/bin directory to your PATH environment variable. To do this, update your .bashrc or .zshrc file and append the following line:
-
-export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
-
-
-kubectl krew install split-yaml
-kubectl krew install neat
-kubectl krew install prune-unused
-
-kubectl krew list 
-
-echo "Component Versions"
-kustomize version
-kubebuilder version
-operator-sdk version
-helm version 
-
-minikube start -p aged --kubernetes-version=${KUBERNETES_VERSION}
-
-kubectl get nodes -o wide
-
-# install cert-manager
-
-helm repo add jetstack https://charts.jetstack.io --force-update
-
-helm repo update
-
-helm search repo cert-manager
-helm search repo cert-manager --versions | grep v1.
-
-helm install \
-  cert-manager jetstack/cert-manager \
-  --namespace cert-manager \
-  --create-namespace \
-  --version $CERT_MANAGER_VERSION  \
-  --set installCRDs=true
-
-
-### add adcs issuer chart repo
-
-helm repo add djkormo-adcs-issuer https://djkormo.github.io/adcs-issuer/ --force-update
-
-### check all versions 
-
-helm search repo adcs-issuer  --versions
-
-
-code --install-extension redhat.vscode-yaml --force
-code --install-extension ms-kubernetes-tools.vscode-kubernetes-tools --force
-
-code --install-extension golang.Go --force
-code --install-extension 766b.go-outliner --force
-
-code --install-extension mhutchie.git-graph --force
-
-echo "done"
+
+#!/bin/bash
+
+set -u
+set -e
+set -x
+
+KUBERNETES_VERSION=v1.26.1
+GO_VERSION=1.21.7
+OPERATOR_SDK_VERSION=v1.19.x
+CERT_MANAGER_VERSION=v1.12.6 
+
+sudo apt-get update
+sudo apt-get install snap dos2unix 
+
+
+# uninstall existing golang 
+
+sudo rm -rvf /usr/local/go/
+
+# install go GO_VERSION
+
+
+VERSION=${GO_VERSION} # go version
+ARCH="amd64" # go architecture
+curl -O -L "https://golang.org/dl/go${VERSION}.linux-${ARCH}.tar.gz"
+ls -l
+
+#Extract the tarball using the tar command:
+
+sudo tar -xf "go${VERSION}.linux-${ARCH}.tar.gz"
+ls -l
+cd go/
+ls -l
+cd ..
+
+
+#Set up the permissions using the chown command/chmod command:
+sudo chown -R root:root ./go
+
+sudo rm -f -R /usr/local/go
+
+sudo mv -v go /usr/local
+
+rm -f go*.tar.gz
+
+cd ~
+
+
+# Kustomize 
+
+curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
+
+chmod a+x kustomize
+sudo mv kustomize /usr/local/bin/kustomize
+
+
+
+# Kubebuilder 
+
+cd ~
+
+curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/$(go env GOOS)/$(go env GOARCH)
+sudo chmod +x kubebuilder && sudo mv kubebuilder /usr/local/bin/kubebuilder
+
+# Operator SDK
+
+git clone https://github.com/operator-framework/operator-sdk
+cd operator-sdk
+git checkout ${OPERATOR_SDK_VERSION}
+make install
+
+cd ~
+
+rm -fr operator-sdk
+
+# Kubernetes staff 
+
+alias k='kubectl'
+alias kubectx='kubectl config use-context '
+alias kubens='kubectl config set-context --current --namespace '
+alias kge='kubectl get events --sort-by=.metadata.creationTimestamp'
+
+# krew plugins 
+
+(
+  set -x; cd "$(mktemp -d)" &&
+  OS="$(uname | tr '[:upper:]' '[:lower:]')" &&
+  ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" &&
+  KREW="krew-${OS}_${ARCH}" &&
+  curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/${KREW}.tar.gz" &&
+  tar zxvf "${KREW}.tar.gz" &&
+  ./"${KREW}" install krew
+)
+
+#Add the $HOME/.krew/bin directory to your PATH environment variable. To do this, update your .bashrc or .zshrc file and append the following line:
+
+export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
+
+
+kubectl krew install split-yaml
+kubectl krew install neat
+kubectl krew install prune-unused
+
+kubectl krew list 
+
+echo "Component Versions"
+kustomize version
+kubebuilder version
+operator-sdk version
+helm version 
+
+minikube start -p aged --kubernetes-version=${KUBERNETES_VERSION}
+
+kubectl get nodes -o wide
+
+# install cert-manager
+
+helm repo add jetstack https://charts.jetstack.io --force-update
+
+helm repo update
+
+helm search repo cert-manager
+helm search repo cert-manager --versions | grep v1.
+
+helm install \
+  cert-manager jetstack/cert-manager \
+  --namespace cert-manager \
+  --create-namespace \
+  --version $CERT_MANAGER_VERSION  \
+  --set installCRDs=true
+
+
+### add adcs issuer chart repo
+
+helm repo add djkormo-adcs-issuer https://djkormo.github.io/adcs-issuer/ --force-update
+
+### check all versions 
+
+helm search repo adcs-issuer  --versions
+
+
+#code --install-extension redhat.vscode-yaml --force
+#code --install-extension ms-kubernetes-tools.vscode-kubernetes-tools --force
+
+#code --install-extension golang.Go --force
+#code --install-extension 766b.go-outliner --force
+
+#code --install-extension mhutchie.git-graph --force
+
+
+
+echo "alias k='kubectl' " >> ~/.bashrc 
+echo "alias kubectx='kubectl config use-context ' " >> ~/.bashrc 
+echo "alias kubens='kubectl config set-context --current --namespace ' " >> ~/.bashrc 
+echo "alias kge='kubectl get events --sort-by=.metadata.creationTimestamp' " >> ~/.bashrc 
+
+echo "done"
+

charts/adcs-issuer/values.yaml

@@ -8,7 +8,7 @@ controllerManager:
   manager:
     image:
       repository: djkormo/adcs-issuer
-      tag: 2.0.8
+      tag: 2.0.9
     resources:
       limits:
         cpu: 100m

install-examples/adcs-simulator/cert-manager-namespace/secret-adcs-sim.yaml

@@ -1,10 +1,10 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: adcs-issuer-credentials
-  namespace: cert-manager # namespace of cert managera and adcs operator
-type: Opaque
-data:
-  password: cGFzc3dvcmQ= # password
-  username: dXNlcm5hbWU= # username
-
+apiVersion: v1
+kind: Secret
+metadata:
+  name: adcs-issuer-credentials
+  namespace: cert-manager # namespace of cert managera and adcs operator
+type: Opaque
+data:
+  password: cGFzc3dvcmQ= # password
+  username: dXNlcm5hbWU= # username
+