It's always a good idea to get an official diagnosis rather than just assume things. You might have tendinitis or gout. Osteoarthritis is a combination of inflammation and worn cartilage. So some things you can look into include:
1. Change your diet to massive decrease foods that cause inflammation. This would includes all types of sugar, processed food, fast foods, and many carbohydrates. Read the book The Plant Paradox to understand this.
2. There are several supplements that some people find helpful. These include glucosamine, chondroitin, Vitamin D3, fish oil. turmeric, and MSM. While none of these will hurt you and some are good for general health, they won't address the problem if you don't have arthritis.